Skip to content

Commit e82df35

Browse files
committed
#501 Fixed screen transition
1 parent d96e605 commit e82df35

File tree

14 files changed

+288
-226
lines changed

14 files changed

+288
-226
lines changed

config/eclipse_memo.md

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# .project ファイル
2+
3+
```
4+
<?xml version="1.0" encoding="UTF-8"?>
5+
<projectDescription>
6+
<name>knowledge</name>
7+
<comment></comment>
8+
<projects>
9+
</projects>
10+
<buildSpec>
11+
<buildCommand>
12+
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
13+
<arguments>
14+
</arguments>
15+
</buildCommand>
16+
<buildCommand>
17+
<name>org.eclipse.jdt.core.javabuilder</name>
18+
<arguments>
19+
</arguments>
20+
</buildCommand>
21+
<buildCommand>
22+
<name>org.eclipse.wst.common.project.facet.core.builder</name>
23+
<arguments>
24+
</arguments>
25+
</buildCommand>
26+
<buildCommand>
27+
<name>org.eclipse.wst.validation.validationbuilder</name>
28+
<arguments>
29+
</arguments>
30+
</buildCommand>
31+
<buildCommand>
32+
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
33+
<arguments>
34+
</arguments>
35+
</buildCommand>
36+
<buildCommand>
37+
<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
38+
<arguments>
39+
</arguments>
40+
</buildCommand>
41+
<!-- 遅いので使わない
42+
<buildCommand>
43+
<name>org.eclipse.m2e.core.maven2Builder</name>
44+
<arguments>
45+
</arguments>
46+
</buildCommand>
47+
-->
48+
</buildSpec>
49+
<natures>
50+
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
51+
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
52+
<nature>org.eclipse.jdt.core.javanature</nature>
53+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
54+
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
55+
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
56+
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
57+
<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
58+
</natures>
59+
</projectDescription>
60+
```
61+
62+

pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<plugin>
225225
<groupId>com.github.eirslett</groupId>
226226
<artifactId>frontend-maven-plugin</artifactId>
227-
<version>1.0</version>
227+
<version>1.3</version>
228228
<executions>
229229
<execution>
230230
<id>install node and npm</id>
@@ -256,6 +256,7 @@
256256
</execution>
257257
<execution>
258258
<id>gulp</id>
259+
<phase>prepare-package</phase>
259260
<goals>
260261
<goal>gulp</goal>
261262
</goals>

src/main/webapp/WEB-INF/views/admin/notice/list.jsp

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@
4545

4646
<nav>
4747
<ul class="pager">
48-
<li class="previous"><a href="#"><span aria-hidden="true">&larr;</span> <%=jspUtil.label("label.previous")%></a></li>
49-
<li><a href="#" class="addButton" data-toggle="modal" data-target="#editModal"><i class="fa fa-plus-circle"></i>&nbsp; <%=jspUtil.label("label.add")%></a></li>
50-
<li class="next"><a href="#"><%=jspUtil.label("label.next")%> <span aria-hidden="true">&rarr;</span></a></li>
48+
<li class="previous"><a class="previousButton"><span aria-hidden="true">&larr;</span> <%=jspUtil.label("label.previous")%></a></li>
49+
<li><a class="addButton" data-toggle="modal" data-target="#editModal"><i class="fa fa-plus-circle"></i>&nbsp; <%=jspUtil.label("label.add")%></a></li>
50+
<li class="next"><a class="nextButton"><%=jspUtil.label("label.next")%> <span aria-hidden="true">&rarr;</span></a></li>
5151
</ul>
5252
</nav>
5353

5454
<div id="notices" class="list-group"></div>
5555

5656
<nav>
5757
<ul class="pager">
58-
<li class="previous"><a href="#"><span aria-hidden="true">&larr;</span> <%=jspUtil.label("label.previous")%></a></li>
59-
<li><a href="#" class="addButton" data-toggle="modal" data-target="#editModal"><i class="fa fa-plus-circle"></i>&nbsp; <%=jspUtil.label("label.add")%></a></li>
60-
<li class="next"><a href="#"><%=jspUtil.label("label.next")%> <span aria-hidden="true">&rarr;</span></a></li>
58+
<li class="previous"><a class="previousButton"><span aria-hidden="true">&larr;</span> <%=jspUtil.label("label.previous")%></a></li>
59+
<li><a class="addButton" data-toggle="modal" data-target="#editModal"><i class="fa fa-plus-circle"></i>&nbsp; <%=jspUtil.label("label.add")%></a></li>
60+
<li class="next"><a class="nextButton"><%=jspUtil.label("label.next")%> <span aria-hidden="true">&rarr;</span></a></li>
6161
</ul>
6262
</nav>
6363

src/main/webapp/WEB-INF/views/admin/proxy/config.jsp

+87-88
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@
1616
<c:param name="PARAM_HEAD">
1717
<style>
1818
.radio_block {
19-
margin-bottom: 10px;
19+
margin-bottom: 10px;
2020
}
2121
.viewarea {
22-
border: 1px solid #DDD;
23-
border-radius: 8px;
24-
-moz-border-radius: 8px;
25-
-webkit-border-radius: 8px;
26-
color: #111;
27-
padding: 10px;
22+
border: 1px solid #DDD;
23+
border-radius: 8px;
24+
-moz-border-radius: 8px;
25+
-webkit-border-radius: 8px;
26+
color: #111;
27+
padding: 10px;
2828
}
2929
</style>
3030
</c:param>
3131

3232
<c:param name="PARAM_SCRIPTS">
3333
<script>
3434
function deleteConfig() {
35-
bootbox.confirm('<%= jspUtil.label("knowledge.mail.confirm.delete") %>', function(result) {
36-
if (result) {
37-
$('#proxyForm').attr('action', '<%= request.getContextPath()%>/admin.proxy/delete');
38-
$('#proxyForm').submit();
39-
}
40-
});
35+
bootbox.confirm('<%= jspUtil.label("knowledge.mail.confirm.delete") %>', function(result) {
36+
if (result) {
37+
$('#proxyForm').attr('action', '<%= request.getContextPath()%>/admin.proxy/delete');
38+
$('#proxyForm').submit();
39+
}
40+
});
4141
};
4242
</script>
4343
</c:param>
@@ -48,85 +48,84 @@ function deleteConfig() {
4848
<h4 class="title"><%= jspUtil.label("knowledge.proxy.title") %></h4>
4949

5050
<div class="alert alert-info alert-dismissible" role="alert">
51-
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
52-
<%= jspUtil.label("knowledge.proxy.msg") %><br/>
51+
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
52+
<%= jspUtil.label("knowledge.proxy.msg") %><br/>
5353
</div>
5454

5555

5656
<form action="<%= request.getContextPath()%>/admin.proxy/save" method="post" role="form" id="proxyForm">
57-
<div class="form-group">
58-
<label for="host"><%= jspUtil.label("label.host") %></label>
59-
<input type="text" class="form-control" name="proxyHostName" id="host" placeholder="HOST NAME" value="<%= jspUtil.out("proxyHostName") %>" />
60-
</div>
61-
<div class="form-group">
62-
<label for="port"><%= jspUtil.label("label.port") %></label>
63-
<input type="text" class="form-control" name="proxyPortNo" id="port" placeholder="PORT" value="<%= jspUtil.out("proxyPortNo") %>" />
64-
</div>
65-
<div class="form-group">
66-
<label for="authType_lock"><%= jspUtil.label("label.auth") %></label><br/>
67-
<label class="radio-inline">
68-
<input type="radio" value="<%= AuthType.None.getValue() %>" name="proxyAuthType"
69-
id="authType_lock" <%= jspUtil.checked(String.valueOf(AuthType.None.getValue()), "proxyAuthType", true) %>/>
70-
<i class="fa fa-unlock"></i>&nbsp;<%= jspUtil.label("knowledge.proxy.auth.none") %>
71-
</label>
72-
<label class="radio-inline">
73-
<input type="radio" value="<%= AuthType.Basic.getValue() %>" name="proxyAuthType"
74-
id="authType_basic" <%= jspUtil.checked(String.valueOf(AuthType.Basic.getValue()), "proxyAuthType", false) %>/>
75-
<i class="fa fa-lock"></i>&nbsp;<%= jspUtil.label("knowledge.proxy.auth.basic") %>
76-
</label>
77-
<label class="radio-inline">
78-
<input type="radio" value="<%= AuthType.NTLM.getValue() %>" name="proxyAuthType"
79-
id="authType_basic" <%= jspUtil.checked(String.valueOf(AuthType.NTLM.getValue()), "proxyAuthType", false) %>/>
80-
<i class="fa fa-lock"></i>&nbsp;<%= jspUtil.label("knowledge.proxy.auth.ntlm") %>
81-
</label>
82-
</div>
83-
<div class="form-group ">
84-
<label for="proxyAuthUserId"><%= jspUtil.label("label.auth.id") %></label>
85-
<input type="text" class="form-control" name="proxyAuthUserId" id="proxyAuthUserId" placeholder="ID" value="<%= jspUtil.out("proxyAuthUserId") %>" />
86-
</div>
87-
<div class="form-group">
88-
<label for="proxyAuthPassword"><%= jspUtil.label("label.auth.password") %></label>
89-
<input type="password" class="form-control" name="proxyAuthPassword" id="proxyAuthPassword" placeholder="PASSWORD" value="<%= jspUtil.out("proxyAuthPassword") %>" />
90-
</div>
91-
<div class="form-group">
92-
<label for="proxyAuthDomain"><%= jspUtil.label("knowledge.proxy.auth.ntlm.domain") %></label>
93-
<input type="text" class="form-control" name="proxyAuthDomain" id="proxyAuthDomain" placeholder="Domain" value="<%= jspUtil.out("proxyAuthDomain") %>" />
94-
</div>
95-
<div class="form-group">
96-
<label for="proxyAuthPcName"><%= jspUtil.label("knowledge.proxy.auth.ntlm.domain") %></label>
97-
<input type="text" class="form-control" name="proxyAuthPcName" id="proxyAuthPcName" placeholder="PC NAME" value="<%= jspUtil.out("proxyAuthPcName") %>" />
98-
</div>
99-
100-
101-
<div class="form-group">
102-
<label for="testType_Proxy"><%= jspUtil.label("knowledge.proxy.test.type") %></label><br/>
103-
<label class="radio-inline">
104-
<input type="radio" value="<%= INT_FLAG.ON.getValue() %>" name="testType"
105-
id="testType_Proxy" <%= jspUtil.checked(String.valueOf(INT_FLAG.ON.getValue()), "testType", true) %>/>
106-
<%= jspUtil.label("knowledge.proxy.test.type.proxy") %>
107-
</label>
108-
<label class="radio-inline">
109-
<input type="radio" value="<%= INT_FLAG.OFF.getValue() %>" name="testType"
110-
id="testType_Direct" <%= jspUtil.checked(String.valueOf(INT_FLAG.OFF.getValue()), "testType", false) %>/>
111-
<%= jspUtil.label("knowledge.proxy.test.type.direct") %>
112-
</label>
113-
</div>
114-
115-
116-
<div class="form-group">
117-
<label for="testUrl"><%= jspUtil.label("knowledge.proxy.testurl") %></label>
118-
<input type="text" class="form-control" name="testUrl" id="testUrl" placeholder="Test URL" value="<%= jspUtil.out("testUrl") %>" />
119-
</div>
120-
121-
<input type="hidden" name="systemName" value="<%= jspUtil.out("systemName") %>" />
122-
123-
<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.save") %></button>
124-
125-
<button type="submit" class="btn btn-success" formaction="<%= request.getContextPath()%>/admin.proxy/test">
126-
<i class="fa fa-check-square-o"></i>&nbsp;<%= jspUtil.label("knowledge.proxy.test") %>
127-
</button>
128-
129-
<button type="button" class="btn btn-danger" onclick="deleteConfig();"><i class="fa fa-remove"></i>&nbsp;<%= jspUtil.label("label.delete") %></button>
57+
<div class="form-group">
58+
<label for="host"><%= jspUtil.label("label.host") %></label>
59+
<input type="text" class="form-control" name="proxyHostName" id="host" placeholder="HOST NAME" value="<%= jspUtil.out("proxyHostName") %>" />
60+
</div>
61+
<div class="form-group">
62+
<label for="port"><%= jspUtil.label("label.port") %></label>
63+
<input type="text" class="form-control" name="proxyPortNo" id="port" placeholder="PORT" value="<%= jspUtil.out("proxyPortNo") %>" />
64+
</div>
65+
<div class="form-group">
66+
<label for="authType_lock"><%= jspUtil.label("label.auth") %></label><br/>
67+
<label class="radio-inline">
68+
<input type="radio" value="<%= AuthType.None.getValue() %>" name="proxyAuthType"
69+
id="authType_lock" <%= jspUtil.checked(String.valueOf(AuthType.None.getValue()), "proxyAuthType", true) %>/>
70+
<i class="fa fa-unlock"></i>&nbsp;<%= jspUtil.label("knowledge.proxy.auth.none") %>
71+
</label>
72+
<label class="radio-inline">
73+
<input type="radio" value="<%= AuthType.Basic.getValue() %>" name="proxyAuthType"
74+
id="authType_basic" <%= jspUtil.checked(String.valueOf(AuthType.Basic.getValue()), "proxyAuthType", false) %>/>
75+
<i class="fa fa-lock"></i>&nbsp;<%= jspUtil.label("knowledge.proxy.auth.basic") %>
76+
</label>
77+
<label class="radio-inline">
78+
<input type="radio" value="<%= AuthType.NTLM.getValue() %>" name="proxyAuthType"
79+
id="authType_basic" <%= jspUtil.checked(String.valueOf(AuthType.NTLM.getValue()), "proxyAuthType", false) %>/>
80+
<i class="fa fa-lock"></i>&nbsp;<%= jspUtil.label("knowledge.proxy.auth.ntlm") %>
81+
</label>
82+
</div>
83+
<div class="form-group ">
84+
<label for="proxyAuthUserId"><%= jspUtil.label("label.auth.id") %></label>
85+
<input type="text" class="form-control" name="proxyAuthUserId" id="proxyAuthUserId" placeholder="ID" value="<%= jspUtil.out("proxyAuthUserId") %>" />
86+
</div>
87+
<div class="form-group">
88+
<label for="proxyAuthPassword"><%= jspUtil.label("label.auth.password") %></label>
89+
<input type="password" class="form-control" name="proxyAuthPassword" id="proxyAuthPassword" placeholder="PASSWORD" value="<%= jspUtil.out("proxyAuthPassword") %>" />
90+
</div>
91+
<div class="form-group">
92+
<label for="proxyAuthDomain"><%= jspUtil.label("knowledge.proxy.auth.ntlm.domain") %></label>
93+
<input type="text" class="form-control" name="proxyAuthDomain" id="proxyAuthDomain" placeholder="Domain" value="<%= jspUtil.out("proxyAuthDomain") %>" />
94+
</div>
95+
<div class="form-group">
96+
<label for="proxyAuthPcName"><%= jspUtil.label("knowledge.proxy.auth.ntlm.domain") %></label>
97+
<input type="text" class="form-control" name="proxyAuthPcName" id="proxyAuthPcName" placeholder="PC NAME" value="<%= jspUtil.out("proxyAuthPcName") %>" />
98+
</div>
99+
100+
101+
<div class="form-group">
102+
<label for="testType_Proxy"><%= jspUtil.label("knowledge.proxy.test.type") %></label><br/>
103+
<label class="radio-inline">
104+
<input type="radio" value="<%= INT_FLAG.ON.getValue() %>" name="testType"
105+
id="testType_Proxy" <%= jspUtil.checked(String.valueOf(INT_FLAG.ON.getValue()), "testType", true) %>/>
106+
<%= jspUtil.label("knowledge.proxy.test.type.proxy") %>
107+
</label>
108+
<label class="radio-inline">
109+
<input type="radio" value="<%= INT_FLAG.OFF.getValue() %>" name="testType"
110+
id="testType_Direct" <%= jspUtil.checked(String.valueOf(INT_FLAG.OFF.getValue()), "testType", false) %>/>
111+
<%= jspUtil.label("knowledge.proxy.test.type.direct") %>
112+
</label>
113+
</div>
114+
115+
<div class="form-group">
116+
<label for="testUrl"><%= jspUtil.label("knowledge.proxy.testurl") %></label>
117+
<input type="text" class="form-control" name="testUrl" id="testUrl" placeholder="Test URL" value="<%= jspUtil.out("testUrl") %>" />
118+
</div>
119+
120+
<input type="hidden" name="systemName" value="<%= jspUtil.out("systemName") %>" />
121+
122+
<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i>&nbsp;<%= jspUtil.label("label.save") %></button>
123+
124+
<button type="submit" class="btn btn-success" formaction="<%= request.getContextPath()%>/admin.proxy/test">
125+
<i class="fa fa-check-square-o"></i>&nbsp;<%= jspUtil.label("knowledge.proxy.test") %>
126+
</button>
127+
128+
<button type="button" class="btn btn-danger" onclick="deleteConfig();"><i class="fa fa-remove"></i>&nbsp;<%= jspUtil.label("label.delete") %></button>
130129
</form>
131130

132131

src/main/webapp/WEB-INF/views/admin/template/view_add.jsp

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ var LABEL_UPDATE = '<%= jspUtil.label("label.update") %>';
5555

5656
<h5><b><%= jspUtil.label("knowledge.template.label.item") %></b></h5>
5757
<div class="form-group">
58-
<a href="#" class="btn btn-info" id="addText"><i class="fa fa-pencil"></i>&nbsp;<%= jspUtil.label("knowledge.template.label.item.text.add") %></a>
59-
<a href="#" class="btn btn-info" id="addRadio"><i class="fa fa-dot-circle-o"></i>&nbsp;<%= jspUtil.label("knowledge.template.label.item.radio.add") %></a>
60-
<a href="#" class="btn btn-info" id="addCheckbox"><i class="fa fa-check-square-o"></i>&nbsp;<%= jspUtil.label("knowledge.template.label.item.checkbox.add") %></a>
58+
<a class="btn btn-info" id="addText"><i class="fa fa-pencil"></i>&nbsp;<%= jspUtil.label("knowledge.template.label.item.text.add") %></a>
59+
<a class="btn btn-info" id="addRadio"><i class="fa fa-dot-circle-o"></i>&nbsp;<%= jspUtil.label("knowledge.template.label.item.radio.add") %></a>
60+
<a class="btn btn-info" id="addCheckbox"><i class="fa fa-check-square-o"></i>&nbsp;<%= jspUtil.label("knowledge.template.label.item.checkbox.add") %></a>
6161
</div>
6262
<div id="items"></div>
6363

0 commit comments

Comments
 (0)