Skip to content

E
em
Commit 29cd3511 by Kim Gyeongeun
Options

Merge branch 'feature/package/em_1.1' into feature/package/em_1.0

parents 6821f00f bac3de3c
Showing with 17 additions and 17 deletions
.classpath
...@@ -66,11 +66,10 @@ ...@@ -66,11 +66,10 @@
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/s2-framework-2.4.45.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/s2-framework-2.4.45.jar"/>
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/s2-tiger-2.4.45.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/s2-tiger-2.4.45.jar"/>
<classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/sa-struts-1.0.4-sp9.jar"/> <classpathentry kind="lib" path="src/main/webapp/WEB-INF/lib/sa-struts-1.0.4-sp9.jar"/>
<classpathentry kind="lib" path="D:/tomcat/apache-tomcat-7.0.76/lib/annotations-api.jar"/> <classpathentry kind="var" path="TOMCAT_HOME/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="D:/tomcat/apache-tomcat-7.0.76/lib/catalina.jar"/> <classpathentry kind="var" path="TOMCAT_HOME/lib/jasper.jar"/>
<classpathentry kind="lib" path="D:/tomcat/apache-tomcat-7.0.76/lib/el-api.jar"/> <classpathentry kind="var" path="TOMCAT_HOME/lib/jsp-api.jar"/>
<classpathentry kind="lib" path="D:/tomcat/apache-tomcat-7.0.76/lib/jasper.jar"/> <classpathentry kind="var" path="TOMCAT_HOME/lib/el-api.jar"/>
<classpathentry kind="lib" path="D:/tomcat/apache-tomcat-7.0.76/lib/jsp-api.jar"/> <classpathentry kind="var" path="TOMCAT_HOME/lib/annotations-api.jar"/>
<classpathentry kind="lib" path="D:/tomcat/apache-tomcat-7.0.76/lib/servlet-api.jar"/>
<classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/> <classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>
</classpath> </classpath>
\ No newline at end of file
src/main/java/jp/agentec/sinaburocast/common/util/velocity/SinaburocastPropertiesTool.java
...@@ -8,12 +8,12 @@ import java.util.Properties; ...@@ -8,12 +8,12 @@ import java.util.Properties;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import jp.agentec.sinaburocast.common.util.PropertyUtil;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.tools.generic.ValueParser; import org.apache.velocity.tools.generic.ValueParser;
import jp.agentec.sinaburocast.common.util.PropertyUtil;
/** /**
* SinaburoCast.properties用VelocityTools. * SinaburoCast.properties用VelocityTools.
* *
...@@ -109,7 +109,7 @@ public class SinaburocastPropertiesTool { ...@@ -109,7 +109,7 @@ public class SinaburocastPropertiesTool {
* いくつかの要素について、設定ファイルになかった場合のデフォルト値を設定する * いくつかの要素について、設定ファイルになかった場合のデフォルト値を設定する
*/ */
private void populateDefaultValues() { private void populateDefaultValues() {
String contextPath = _application.getContextPath(); String contextPath = _application.getContextPath();
if (contextPath == null) contextPath = ""; if (contextPath == null) contextPath = "";
if (_application.getAttribute(PropertyKey.CSSPATH) == null) { if (_application.getAttribute(PropertyKey.CSSPATH) == null) {
......
src/main/webapp/WEB-INF/view/admin/enquete/questionEdit.html
...@@ -459,7 +459,7 @@ window.scroll(500,500); ...@@ -459,7 +459,7 @@ window.scroll(500,500);
<div class="text_number"> <div class="text_number">
該当選択肢&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 該当選択肢&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<select name="radioFreeNo" id="select" class="w100"> <select name="radioFreeNo" id="select" class="w100">
#foreach( $length in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21] ) #foreach( $length in [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100] )
<option value="$length" #if($!radioFreeNo == $length) selected #end>$length</option> <option value="$length" #if($!radioFreeNo == $length) selected #end>$length</option>
#end #end
</select> </select>
...@@ -497,14 +497,14 @@ window.scroll(500,500); ...@@ -497,14 +497,14 @@ window.scroll(500,500);
最大選択数 最大選択数
<select name="checkMaxSelectNum" id="select" class="w40"> <select name="checkMaxSelectNum" id="select" class="w40">
#if(!$checkMaxSelectNum) #set($checkMaxSelectNum = 1) #end #if(!$checkMaxSelectNum) #set($checkMaxSelectNum = 1) #end
#foreach( $length in [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21] ) #foreach( $length in [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100] )
<option value="$length" #if($!checkMaxSelectNum == $length) selected #end >$length</option> <option value="$length" #if($!checkMaxSelectNum == $length) selected #end >$length</option>
#end #end
</select>&nbsp; </select>&nbsp;
最小選択数 最小選択数
<select name="checkMinSelectNum" id="select" class="w40"> <select name="checkMinSelectNum" id="select" class="w40">
#foreach( $length in [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21] ) #foreach( $length in [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100] )
<option value="$length" #if($!checkMinSelectNum == $length) selected #end >$length</option> <option value="$length" #if($!checkMinSelectNum == $length) selected #end >$length</option>
#end #end
</select>&nbsp; </select>&nbsp;
...@@ -561,7 +561,7 @@ window.scroll(500,500); ...@@ -561,7 +561,7 @@ window.scroll(500,500);
<div class="text_number"> <div class="text_number">
該当選択肢&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 該当選択肢&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<select name="checkFreeNo" id="select" class="w100"> <select name="checkFreeNo" id="select" class="w100">
#foreach( $length in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21] ) #foreach( $length in [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100] )
<option value="$length" #if($!checkFreeNo == $length) selected #end>$length</option> <option value="$length" #if($!checkFreeNo == $length) selected #end>$length</option>
#end #end
</select> </select>
......
src/main/webapp/WEB-INF/view/admin/login/login.html
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
<div id="login_contents"> <div id="login_contents">
<h1><img src="/em/images/h1.jpg" width="160" height="61" alt="logo" / class="mgb20"></h1> <h1><img src="/em/images/h1.jpg" width="160" height="61" alt="logo" / class="mgb20"></h1>
<form method="POST" action="#qs('/admin/login/auth/')" name="frm"> <form method="POST" action="#qs('/admin/login/auth/')" name="frm">
<div id="top_login" class="clearfix ><span class="floatL" style="font-size: 120%;">ログインID : </span><span class="floatR" style="font-size: 120%;"><input name="loginId" type="text" class="w230" value="$!adminLoginForm.loginId" onkeydown="javascript:if(event.keyCode == 13){ return false; }" onkeyup="javascript:if(event.keyCode == 13){ submitForm() }; return false;"></span></div> <div id="top_login" class="clearfix ><span class="floatL" style="font-size: 120%;">ログインID</span><span class="floatR" style="font-size: 120%;"><input name="loginId" type="text" class="w230" value="$!adminLoginForm.loginId" onkeydown="javascript:if(event.keyCode == 13){ return false; }" onkeyup="javascript:if(event.keyCode == 13){ submitForm() }; return false;"></span></div>
<div id="top_login" class="clearfix><span class="floatL" style="font-size: 120%;">パスワード : </span><span class="floatR" style="font-size: 120%;"><input name="password" type="password" class="w230" value="$!adminLoginForm.password" onkeydown="javascript:if(event.keyCode == 13){ return false; }" onkeyup="javascript:if(event.keyCode == 13){ submitForm() }; return false;" autocomplete="off"></span></div> <div id="top_login" class="clearfix><span class="floatL" style="font-size: 120%;">パスワード</span><span class="floatR" style="font-size: 120%;"><input name="password" type="password" class="w230" value="$!adminLoginForm.password" onkeydown="javascript:if(event.keyCode == 13){ return false; }" onkeyup="javascript:if(event.keyCode == 13){ submitForm() }; return false;" autocomplete="off"></span></div>
<div id="login_btn"><a href="#" onclick="document.frm.submit()"><img src="/em/images/btn_login_off.jpg" width="130" height="35" /></a></div> <div id="login_btn"><a href="#" onclick="document.frm.submit()"><img src="/em/images/btn_login_off.jpg" width="130" height="35" /></a></div>
$!tools.getMsgs() $!tools.getMsgs()
</form> </form>
......
src/main/webapp/WEB-INF/view/common/footer_admin.vm
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer_contents"> <div id="footer_contents">
<div id="copyright">&copy;2012 AGENTEC Co.,Ltd. All rights reserved. <div id="copyright">&copy;2012 AGENTEC Co.,Ltd. All rights reservedd.
</div> </div>
<div id="totop"> <div id="totop">
<a href="#" onclick="top(); return false"><img src="/em/images/btn_pagetop_off.jpg" width="134" height="40" alt="ページトップへ" /></a> <a href="#" onclick="top(); return false"><img src="/em/images/btn_pagetop_off.jpg" width="134" height="40" alt="ページトップへ" /></a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment