From edf643f68b71a77cb246485f1be7bb18ba2d6453 Mon Sep 17 00:00:00 2001 From: magi_ikuko Date: Thu, 18 May 2017 12:12:47 +0900 Subject: [PATCH 01/48] changed to qiita compatible navbar. --- .../views/commons/layout/commonNavbar.jsp | 140 ++++++++++-------- 1 file changed, 76 insertions(+), 64 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp index 8a45e493c..fd301957c 100644 --- a/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp +++ b/src/main/webapp/WEB-INF/views/commons/layout/commonNavbar.jsp @@ -65,77 +65,89 @@ From 288277c8d1ef40676f429768c38dd0de38ce3af3 Mon Sep 17 00:00:00 2001 From: Koda Date: Sat, 20 May 2017 05:57:03 +0900 Subject: [PATCH 02/48] #732 Remove base tag --- .../views/admin/customservice/config.jsp | 2 +- .../WEB-INF/views/admin/database/index.jsp | 4 +- .../WEB-INF/views/admin/mailhook/hook.jsp | 8 +- .../views/admin/mailtemplate/index.jsp | 2 +- .../WEB-INF/views/admin/notice/list.jsp | 18 ++-- .../WEB-INF/views/admin/template/edit.jsp | 6 +- .../views/commons/layout/commonHeader.jsp | 22 +++-- .../views/commons/layout/commonScripts.jsp | 26 +++--- src/main/webapp/WEB-INF/views/index/index.jsp | 2 +- .../WEB-INF/views/open/account/account.jsp | 6 +- .../views/open/knowledge/histories.jsp | 2 +- .../WEB-INF/views/open/knowledge/history.jsp | 10 +-- .../partials/partials-list-scripts.jsp | 24 +++--- .../partials/partials-list-styles.jsp | 6 +- .../partials/partials-view-scripts.jsp | 82 +++++++++---------- .../partials/partials-view-styles.jsp | 20 ++--- .../WEB-INF/views/open/knowledge/search.jsp | 14 ++-- .../WEB-INF/views/open/license/index.jsp | 2 +- .../webapp/WEB-INF/views/open/notice/list.jsp | 14 ++-- .../WEB-INF/views/protect/account/index.jsp | 16 ++-- .../WEB-INF/views/protect/account/targets.jsp | 2 +- .../views/protect/group/view_group.jsp | 2 +- .../views/protect/knowledge/edit_comment.jsp | 36 ++++---- .../partials/partials-edit-scripts.jsp | 58 ++++++------- .../partials/partials-edit-styles.jsp | 22 ++--- .../WEB-INF/views/protect/survey/answers.jsp | 12 +-- .../WEB-INF/views/protect/survey/edit.jsp | 6 +- src/main/webapp/js/autocomplete.js | 4 +- 28 files changed, 213 insertions(+), 215 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/admin/customservice/config.jsp b/src/main/webapp/WEB-INF/views/admin/customservice/config.jsp index ca91dd213..6febf5211 100644 --- a/src/main/webapp/WEB-INF/views/admin/customservice/config.jsp +++ b/src/main/webapp/WEB-INF/views/admin/customservice/config.jsp @@ -27,7 +27,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/admin/database/index.jsp b/src/main/webapp/WEB-INF/views/admin/database/index.jsp index a00a379d4..ecf25c00e 100644 --- a/src/main/webapp/WEB-INF/views/admin/database/index.jsp +++ b/src/main/webapp/WEB-INF/views/admin/database/index.jsp @@ -18,13 +18,13 @@ } - + - + - - + + + + diff --git a/src/main/webapp/WEB-INF/views/admin/notice/list.jsp b/src/main/webapp/WEB-INF/views/admin/notice/list.jsp index 73e6d3c3d..fe7dcfe26 100644 --- a/src/main/webapp/WEB-INF/views/admin/notice/list.jsp +++ b/src/main/webapp/WEB-INF/views/admin/notice/list.jsp @@ -15,21 +15,21 @@ - - + + - - - - - - + + + + + + - + diff --git a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp index d220b6f53..b4b6bc6c4 100644 --- a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp +++ b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp @@ -11,14 +11,14 @@ - + - - + + 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 16290c9c8..39ac31c9d 100644 --- a/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp +++ b/src/main/webapp/WEB-INF/views/commons/layout/commonHeader.jsp @@ -33,33 +33,31 @@ - - <% if (StringUtils.isNotEmpty(jspUtil.out("thema"))) { %> -/bootstrap.min.css" /> +/bootstrap.min.css" /> <% } else { %> -/bootstrap.min.css" /> +/bootstrap.min.css" /> <% } %> <% if (StringUtils.isNotEmpty(jspUtil.out("highlight"))) { %> -.css" /> +.css" /> <% } else { %> -.css" /> +.css" /> <% } %> - - + + - - + + 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 50c36ea01..8f807966c 100644 --- a/src/main/webapp/WEB-INF/views/commons/layout/commonScripts.jsp +++ b/src/main/webapp/WEB-INF/views/commons/layout/commonScripts.jsp @@ -10,26 +10,26 @@ <% JspUtil jspUtil = new JspUtil(request, pageContext); %> - - + + - + - - - + + + - - + + - + - - + + - + - + diff --git a/src/main/webapp/WEB-INF/views/index/index.jsp b/src/main/webapp/WEB-INF/views/index/index.jsp index f8895a198..890d5b253 100644 --- a/src/main/webapp/WEB-INF/views/index/index.jsp +++ b/src/main/webapp/WEB-INF/views/index/index.jsp @@ -18,7 +18,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/open/account/account.jsp b/src/main/webapp/WEB-INF/views/open/account/account.jsp index 74d1a3742..2c07fb4ad 100644 --- a/src/main/webapp/WEB-INF/views/open/account/account.jsp +++ b/src/main/webapp/WEB-INF/views/open/account/account.jsp @@ -14,14 +14,14 @@ - + - - + + diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/histories.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/histories.jsp index dd2baee17..adfc3176e 100644 --- a/src/main/webapp/WEB-INF/views/open/knowledge/histories.jsp +++ b/src/main/webapp/WEB-INF/views/open/knowledge/histories.jsp @@ -16,7 +16,7 @@ - + - - - + + + + - - - - - - + + + + + + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-styles.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-styles.jsp index 62aadaad7..a880fc45a 100644 --- a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-styles.jsp +++ b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-styles.jsp @@ -7,16 +7,16 @@ <% JspUtil jspUtil = new JspUtil(request, pageContext); %> - - - - - - + + + + + + - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/search.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/search.jsp index 45e70b5e1..5576b1ade 100644 --- a/src/main/webapp/WEB-INF/views/open/knowledge/search.jsp +++ b/src/main/webapp/WEB-INF/views/open/knowledge/search.jsp @@ -16,18 +16,18 @@ - - + + - - - - - + + + + + - - + + - + - - - + + + diff --git a/src/main/webapp/WEB-INF/views/protect/account/index.jsp b/src/main/webapp/WEB-INF/views/protect/account/index.jsp index 28e1f7805..ec178ab85 100644 --- a/src/main/webapp/WEB-INF/views/protect/account/index.jsp +++ b/src/main/webapp/WEB-INF/views/protect/account/index.jsp @@ -13,19 +13,19 @@ - - - + + + - - - - - + + + + + diff --git a/src/main/webapp/WEB-INF/views/protect/account/targets.jsp b/src/main/webapp/WEB-INF/views/protect/account/targets.jsp index ff691d353..9e40d78cb 100644 --- a/src/main/webapp/WEB-INF/views/protect/account/targets.jsp +++ b/src/main/webapp/WEB-INF/views/protect/account/targets.jsp @@ -17,7 +17,7 @@ - + - + - - + + - - - + + + - - + + - - - + + + - - + + diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-scripts.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-scripts.jsp index e890cd8f6..9e4e4bcb3 100644 --- a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-scripts.jsp +++ b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-scripts.jsp @@ -15,39 +15,39 @@ MathJax.Hub.Config({ }); - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-styles.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-styles.jsp index cca8c4ee4..a04523aa1 100644 --- a/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-styles.jsp +++ b/src/main/webapp/WEB-INF/views/protect/knowledge/partials/partials-edit-styles.jsp @@ -9,18 +9,18 @@ <% JspUtil jspUtil = new JspUtil(request, pageContext); %> - - - - - - - + + + + + + + - - - - + + + +