Merge branch 'master' into develop

abvw/bookmark.html

@@ -48,6 +48,7 @@
                 <li class="jp" id="language-jp"><a href="#">日本語</a></li>
                 <li class="eng" id="language-en"><a href="#">English</a></li>
                 <li class="kor" id="language-kr"><a href="#">한글</a></li>
+                <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
                 <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
                 <div id="header-searchbox">
 					<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>

abvw/contentsearch.html

@@ -49,6 +49,7 @@
                 <li class="jp" id="language-jp"><a href="#">日本語</a></li>
                 <li class="eng" id="language-en"><a href="#">English</a></li>
                 <li class="kor" id="language-kr"><a href="#">한글</a></li>
+                <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
                 <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
                 <div id="header-searchbox">
 					<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>

abvw/css/common.css

@@ -204,3 +204,13 @@ footer{ display:block; background:#fff; height:39px; border-top:1px solid #ccccc
 
 
 .focus{color: #969696}
+.cnt_header .manual_link {
+	float:right;
+	width:50px;
+	font-size: 12px;
+}
+.cnt_header .menu_language ul li.manual_link {
+	float:none;
+	width:50px;
+	font-size: 12px;
+}
\ No newline at end of file

abvw/history.html

@@ -48,6 +48,7 @@
                 <li class="jp" id="language-jp"><a href="#">日本語</a></li>
                 <li class="eng" id="language-en"><a href="#">English</a></li>
                 <li class="kor" id="language-kr"><a href="#">한글</a></li>
+                <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
                 <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
                 <div id="header-searchbox">
 					<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>

abvw/home.html

@@ -58,6 +58,7 @@
                 <li class="jp" id="language-jp"><a href="#">日本語</a></li>
                 <li class="eng" id="language-en"><a href="#">English</a></li>
                 <li class="kor" id="language-kr"><a href="#">한글</a></li>
+                <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
                 <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
                 <div id="header-searchbox">
 					<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>

abvw/settings.html

@@ -49,6 +49,7 @@
                 <li class="jp" id="language-jp"><a href="#">日本語</a></li>
                 <li class="eng" id="language-en"><a href="#">English</a></li>
                 <li class="kor" id="language-kr"><a href="#">한글</a></li>
+                <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
                 <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
                 <div id="header-searchbox">
 					<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>

env.sh

 #!/bin/sh
+PROTOCOL=$1
+DOMAIN=$2
 
 modify_htaccess()
 {
@@ -33,20 +35,23 @@ modify_api()
 EOF
 }
 
-case "$1" in
-		localhost)
-				modify_htaccess "http://localhost/nmoto/Sites/webviewer/"
-				modify_api "https://web3.agentec.jp/acms"
-				;;
-		web2)
-				modify_htaccess "https://web2.mediaservice.agentec.jp/mc/webviewer/"
-				modify_api "https://web2.mediaservice.agentec.jp/mc"
-				;;
-		web3)
-				modify_htaccess "https://web3.agentec.jp/web/"
-				modify_api "https://web3.agentec.jp/acms"
-				;;
-		*)
-				echo $"Usage: $0 {localhost|web2|web3}"
-				;;
-esac
+modify_htaccess "$PROTOCOL://$DOMAIN/web/"
+modify_api "$PROTOCOL://$DOMAIN/acms"
+
+# case "$1" in
+#		localhost)
+#				modify_htaccess "http://localhost/nmoto/Sites/webviewer/"
+#				modify_api "https://web3.agentec.jp/acms"
+#				;;
+#		web2)
+#				modify_htaccess "https://web2.mediaservice.agentec.jp/mc/webviewer/"
+#				modify_api "https://web2.mediaservice.agentec.jp/mc"
+#				;;
+#		web3)
+#				modify_htaccess "https://web3.agentec.jp/web/"
+#				modify_api "https://web3.agentec.jp/acms"
+#				;;
+#		*)
+#				echo $"Usage: $0 {localhost|web2|web3}"
+#				;;
+# esac

login.html

@@ -43,6 +43,7 @@
                 <li class="kor"><a id="language-ko">한국어</a></li>
             </ul>
         </div>
+        <div class="manual_link"><a id="manual" href="usermanual.html" target="_manual">Manual</a></div>
     </div>
 </header>
 <div class="wrapper">