絵文字に何があるのかすぐ分かるようにしたい #56

Markdownの説明欲しい #57
support-project · Jun 17, 2015 · 86d7d47 · 86d7d47
1 parent 0e11ef7
commit 86d7d47
Show file tree

Hide file tree

Showing 16 changed files with 7,224 additions and 12 deletions.
diff --git a/src/main/java/org/support/project/knowledge/control/open/EmojiControl.java b/src/main/java/org/support/project/knowledge/control/open/EmojiControl.java
@@ -0,0 +1,41 @@
+package org.support.project.knowledge.control.open;
+
+import org.support.project.di.DI;
+import org.support.project.di.Instance;
+import org.support.project.knowledge.control.Control;
+import org.support.project.web.boundary.Boundary;
+import org.support.project.web.control.service.Get;
+
+@DI(instance=Instance.Prototype)
+public class EmojiControl extends Control {
+
+	/* (non-Javadoc)
+	 * @see org.support.project.web.control.Control#index()
+	 */
+	@Override
+	@Get
+	public Boundary index() {
+		return super.forward("cheatsheet.jsp");
+	}
+	@Get
+	public Boundary people() {
+		return super.forward("people.jsp");
+	}
+	@Get
+	public Boundary nature() {
+		return super.forward("nature.jsp");
+	}
+	@Get
+	public Boundary objects() {
+		return super.forward("objects.jsp");
+	}
+	@Get
+	public Boundary places() {
+		return super.forward("places.jsp");
+	}
+	@Get
+	public Boundary symbols() {
+		return super.forward("symbols.jsp");
+	}
+
+}
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
@@ -53,7 +53,7 @@ message.allready.updated=Allready updated.
 message.allready.started=Allready started.
 
 # Common Label
-label.version=0.5.2 pre4
+label.version=0.5.2 pre5
 label.login=Sign in
 label.previous = Previous
 label.next=Next
@@ -413,7 +413,41 @@ knowledge.export.msg3=After the execution, Please wait
 knowledge.export.msg.start=We have to generate the export data.
 knowledge.export.msg.end=Generation of export data has been completed.
 
-
+knowledge.sample.markdown.1=- Copy the text that has been written here in the knowledge Then "Preview",
+knowledge.sample.markdown.2=\u0020\u0020You can image the display of Markdown
+knowledge.sample.markdown.11=#### Heading -> "#"
+knowledge.sample.markdown.12=- "#" is heading
+knowledge.sample.markdown.13=\u0020\u0020\u0020- After the "#", by opening a space, write the title of the character
+knowledge.sample.markdown.14=\u0020\u0020\u0020- Change is the number the magnitude of the "#"
+knowledge.sample.markdown.21=#### Itemization -> "-"
+knowledge.sample.markdown.22=- "-" is itemization
+knowledge.sample.markdown.23=\u0020\u0020\u0020- After the "#", by opening a space, write the contents of the bullet
+knowledge.sample.markdown.24=\u0020\u0020\u0020- If the space put three, and displayed by being indented as before
+knowledge.sample.markdown.25=\u0020\u0020\u0020\u0020\u0020\u0020- This will be displayed in a hierarchical structure as
+knowledge.sample.markdown.31=#### Itemization(with numbers) -> "1."
+knowledge.sample.markdown.32=1. "1." is itemization(with numbers)
+knowledge.sample.markdown.33=\u0020\u0020\u00201. After the "1.", by opening a space, write the contents of the bullet
+knowledge.sample.markdown.34=\u0020\u0020\u00201.Except that the number is attached "-" and this is the same
+knowledge.sample.markdown.41=#### Strong -> "Two * (asterisk)"
+knowledge.sample.markdown.42=- Emphasize that it surrounds the emphasis you want part in the statement in the "two * (asterisk)"
+knowledge.sample.markdown.43=\u0020\u0020\u0020- ** It is like this ** emphasized for example
+knowledge.sample.markdown.51=#### Border -> "Three or more of the * (asterisk)"
+knowledge.sample.markdown.52=- If you want to put a border, it is described only "three or more of the * (asterisk)"
+knowledge.sample.markdown.53=***
+knowledge.sample.markdown.54=- Border is displayed above
+knowledge.sample.markdown.61=#### Link
+knowledge.sample.markdown.62=- The part you want to put a link, to describe the [name of the link](link destination URL)
+knowledge.sample.markdown.63=\u0020\u0020\u0020- [Knowledge](https://support-project.org/knowledge)
+knowledge.sample.markdown.71=#### Code
+knowledge.sample.markdown.72=- Where you want to display the code is enclosed in "` (back quote) "
+knowledge.sample.markdown.73=```ruby
+knowledge.sample.markdown.74=require 'redcarpet'
+knowledge.sample.markdown.75=markdown = Redcarpet.new("Hello World!")
+knowledge.sample.markdown.76=puts markdown.to_html
+knowledge.sample.markdown.77=```
+knowledge.sample.markdown.501=#### More info
+knowledge.sample.markdown.502=- [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/) 
+knowledge.sample.markdown.preview=Preview this sample
 
 
 
diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
@@ -53,7 +53,7 @@ message.allready.updated=すでに更新されています
 message.allready.started=すでに開始済です
 
 # Common Label
-label.version=0.5.2 pre4
+label.version=0.5.2 pre5
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ
@@ -196,10 +196,10 @@ knowledge.add.label.title=タイトル
 knowledge.add.label.content=コンテンツ
 knowledge.add.label.files=ファイルを添付する
 knowledge.add.label.select.file=ファイルを選択...
-knowledge.add.label.area.upload=添付したいファイルをここにドロップすると、添付（アップロード）します(10MBまで)
+knowledge.add.label.area.upload=添付するファイルをここにドロップすると、アップロードします(10MBまで)
 knowledge.add.label.public.class=公開範囲
 knowledge.add.label.public.class.public=公開
-knowledge.add.label.public.class.private=非公開（あなただけしかアクセスできません）
+knowledge.add.label.public.class.private=非公開（自分のみ）
 knowledge.add.label.public.class.protect=保護（公開先を選択）
 knowledge.add.label.tags=タグ
 knowledge.add.label.groups=公開先
@@ -413,3 +413,39 @@ knowledge.export.msg3=このため、エクスポートを実行した後、ダ
 knowledge.export.msg.start=エクスポートデータを生成しています。
 knowledge.export.msg.end=エクスポートデータの生成が完了しました。
 
+knowledge.sample.markdown.1=- ここに書かれている文章をナレッジにコピーして「プレビュー」すると、
+knowledge.sample.markdown.2=\u0020\u0020Markdownがどのように表示されるかのイメージが湧くと思います
+knowledge.sample.markdown.11=#### 見出し -> 「#」
+knowledge.sample.markdown.12=- 「#」はタイトル
+knowledge.sample.markdown.13=\u0020\u0020\u0020- 「#」の後に、スペースを1つあけて、タイトルの文字を書く
+knowledge.sample.markdown.14=\u0020\u0020\u0020- 「#」の個数で大きさが変わる（個数が多くなるほど小さくなる）
+knowledge.sample.markdown.21=#### 箇条書き -> 「-」
+knowledge.sample.markdown.22=- 「-」は箇条書き
+knowledge.sample.markdown.23=\u0020\u0020\u0020- 「-」の後に、スペースを1つあけて、箇条書きの内容を書く
+knowledge.sample.markdown.24=\u0020\u0020\u0020- 「-」の前に、スペースを3つ置くと、インデントされて表示される
+knowledge.sample.markdown.25=\u0020\u0020\u0020\u0020\u0020\u0020- このように階層構造で表示される
+knowledge.sample.markdown.31=#### 箇条書き(番号付き) -> 「1.」
+knowledge.sample.markdown.32=1. 「1.」は箇条書き(番号付き)
+knowledge.sample.markdown.33=\u0020\u0020\u00201. 「1.」の後に、スペースを1つあけて、箇条書きの内容を書く
+knowledge.sample.markdown.34=\u0020\u0020\u00201. 番号が付くこと以外「-」と同じ
+knowledge.sample.markdown.41=#### 強調 -> 「2つの*(アスタリスク)」
+knowledge.sample.markdown.42=- 文の中の強調したい部分を「2つの*(アスタリスク)」で囲むと強調する
+knowledge.sample.markdown.43=\u0020\u0020\u0020- 例えば **こんなふうに** 強調される
+knowledge.sample.markdown.51=#### 罫線 -> 「3つ以上の*(アスタリスク)」
+knowledge.sample.markdown.52=- 罫線を入れたい場合、「3つ以上の*(アスタリスク)」のみを記載する
+knowledge.sample.markdown.53=***
+knowledge.sample.markdown.54=- 上に罫線が表示される
+knowledge.sample.markdown.61=#### リンク
+knowledge.sample.markdown.62=- リンクを入れたい部分に、[リンクの名前](リンク先のURL) を記載する
+knowledge.sample.markdown.63=\u0020\u0020\u0020- [Knowledge](https://support-project.org/knowledge)
+knowledge.sample.markdown.71=#### コードを表示
+knowledge.sample.markdown.72=- コードを表示したい部分は「`（バッククオート）」で囲みます
+knowledge.sample.markdown.73=```ruby
+knowledge.sample.markdown.74=require 'redcarpet'
+knowledge.sample.markdown.75=markdown = Redcarpet.new("Hello World!")
+knowledge.sample.markdown.76=puts markdown.to_html
+knowledge.sample.markdown.77=```
+knowledge.sample.markdown.501=#### さらに詳しく
+knowledge.sample.markdown.502=- [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/) が参考になります
+knowledge.sample.markdown.preview=Sampleで確認
+
diff --git a/src/main/webapp/WEB-INF/views/open/emoji/cheatsheet.jsp b/src/main/webapp/WEB-INF/views/open/emoji/cheatsheet.jsp
@@ -0,0 +1,60 @@
+<%@page pageEncoding="UTF-8" isELIgnored="false" session="false"
+	errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
+
+<!-- Modal -->
+<div class="modal fade" id="emojiPeopleModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+
+<!-- Modal -->
+<div class="modal fade" id="emojiNatureModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+        </div>
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+
+
+<!-- Modal -->
+<div class="modal fade" id="emojiObjectsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+
+
+<!-- Modal -->
+<div class="modal fade" id="emojiPlacesModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+
+
+<!-- Modal -->
+<div class="modal fade" id="emojiSymbolsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!-- /.modal -->
+