From ae807754f6812074945c9ab5b9f0e0f84c07990f Mon Sep 17 00:00:00 2001 From: koda Date: Sat, 23 May 2015 07:06:20 +0900 Subject: [PATCH 1/8] =?UTF-8?q?#46=20IE=E3=81=AE=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bower.json | 8 +++++--- pom.xml | 4 ++-- src/main/resources/appresource.properties | 2 +- src/main/resources/appresource_ja.properties | 2 +- .../views/commons/layout/commonHeader.jsp | 15 +++++++++++---- .../views/commons/layout/commonScripts.jsp | 9 +++++++-- src/main/webapp/WEB-INF/views/index/index.jsp | 16 +--------------- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bower.json b/bower.json index a42e7a063..fc1358193 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,11 @@ { "name": "knowledge", "dependencies": { - "jquery": "2.1.1", - "bootstrap": "3.3.1", - "font-awesome": "4.2.0", + "jquery": "1.11.2", + "bootstrap": "3.3.4", + "font-awesome": "4.3.0", + "html5shiv": "3.7.2", + "respond": "1.4.2", "notifyjs": "0.3.2", "marked": "0.3.2", "highlightjs": "8.3.0", diff --git a/pom.xml b/pom.xml index 2709bcc17..825a45be8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.support-project knowledge war - 0.5.1 + 0.5.2-SNAPSHOT webapp for knowledge https://support-project.org/ @@ -16,7 +16,7 @@ org.support-project web - 0.5.1 + 0.5.2-SNAPSHOT diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties index f98ad1532..7dd07fa04 100644 --- 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.1 +label.version=0.5.2 pre1 label.login=Sign in label.previous = Previous label.next=Next diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties index 84e0c4694..04413ba4b 100644 --- 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.1 +label.version=0.5.2 pre1 label.login=サインイン label.previous = 前へ label.next = 次へ diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp index 35b33534a..5a184b4d3 100644 --- a/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp +++ b/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp @@ -17,15 +17,22 @@ -" name="title"> -" name="description"> + - +" name="title"> +" name="description"> + + +"/> +" /> +<%-- --%> + + + - diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonScripts.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonScripts.jsp index 035f108c3..6718a1f1c 100644 --- a/src/main/webapp/WEB-INF/views/commons/layout/commonScripts.jsp +++ b/src/main/webapp/WEB-INF/views/commons/layout/commonScripts.jsp @@ -8,8 +8,8 @@ <% JspUtil jspUtil = new JspUtil(request, pageContext); %> - - + + @@ -22,6 +22,11 @@ + + +
+
+
+
+ About Knowledge +
<%=jspUtil.label("knowledge.top.description")%>
+
+
+
+
+
+ +
+
<%=jspUtil.label("knowledge.top.about.title.1")%>
+
<%=jspUtil.label("knowledge.top.about.description.1")%>
+
+
+
+ +
+
<%=jspUtil.label("knowledge.top.about.title.2")%>
+
<%=jspUtil.label("knowledge.top.about.description.2")%>
+
+
+
+ +
+
<%=jspUtil.label("knowledge.top.about.title.3")%>
+
<%=jspUtil.label("knowledge.top.about.description.3")%>
+
+
+
+ +
+
<%=jspUtil.label("knowledge.top.about.title.4")%>
+
<%=jspUtil.label("knowledge.top.about.description.4")%>
+
+
+
+
+
+ +
+
<%=jspUtil.label("knowledge.top.about.title.5")%>
+
<%=jspUtil.label("knowledge.top.about.description.5")%>
+
+
+
+ +
+
<%=jspUtil.label("knowledge.top.about.title.6")%>
+
<%=jspUtil.label("knowledge.top.about.description.6")%>
+
+
+
+ +
+
<%=jspUtil.label("knowledge.top.about.title.7")%>
+
<%=jspUtil.label("knowledge.top.about.description.7")%>
+
+
+
+ +
+
<%=jspUtil.label("knowledge.top.about.title.8")%>
+
<%=jspUtil.label("knowledge.top.about.description.8")%>
+
+
+ +
+
+
+ -> More Information +
+
+
+ + + +
+
+ - - + diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp index 56f6f96fd..14317a7e5 100644 --- a/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp +++ b/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp @@ -113,8 +113,7 @@ var LABEL_LIKE = '<%= jspUtil.label("knowledge.view.like") %>'; <% if (request.getRemoteUser() != null) { - if (request.isUserInRole("admin") - || jspUtil.out("insertUser").equals(request.getRemoteUser())) { %> + if ((boolean) request.getAttribute("edit")) { %> <%= jspUtil.out("params") %>" class="btn btn-primary" role="button">  <%= jspUtil.label("label.edit") %> diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/view_add.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/view_add.jsp index f4927cbc0..f223eb02b 100644 --- a/src/main/webapp/WEB-INF/views/protect/knowledge/view_add.jsp +++ b/src/main/webapp/WEB-INF/views/protect/knowledge/view_add.jsp @@ -36,6 +36,9 @@ var _CONFIRM = '<%= jspUtil.label("knowledge.edit.label.confirm.delete") %>'; selectedGroups.push({label: '<%= jspUtil.out("group.label") %>', value: '<%= jspUtil.out("group.value") %>'}); + +selectedEditors.push({label: '<%= jspUtil.out("editor.label") %>', value: '<%= jspUtil.out("editor.value") %>'}); + @@ -133,6 +136,17 @@ selectedGroups.push({label: '<%= jspUtil.out("group.label") %>', value: '<%= jsp

+ + " /> " /> " /> @@ -153,7 +167,54 @@ selectedGroups.push({label: '<%= jspUtil.out("group.label") %>', value: '<%= jsp

+<%-- Editors --%> + +<%-- Targets --%>