Skip to content

C
check
Commit 7619e3e9 by Motohisa Nakano
Options

Merge branch 'master' into develop

parents a0f5b13e bffad8d5
Showing with 39 additions and 17 deletions
abvw/bookmark.html
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<li class="jp" id="language-jp"><a href="#">日本語</a></li> <li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</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="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> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <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/> <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 @@ ...@@ -49,6 +49,7 @@
<li class="jp" id="language-jp"><a href="#">日本語</a></li> <li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</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="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> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <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/> <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 ...@@ -204,3 +204,13 @@ footer{ display:block; background:#fff; height:39px; border-top:1px solid #ccccc
.focus{color: #969696} .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 @@ ...@@ -48,6 +48,7 @@
<li class="jp" id="language-jp"><a href="#">日本語</a></li> <li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</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="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> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <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/> <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 @@ ...@@ -58,6 +58,7 @@
<li class="jp" id="language-jp"><a href="#">日本語</a></li> <li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</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="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> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <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/> <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 @@ ...@@ -49,6 +49,7 @@
<li class="jp" id="language-jp"><a href="#">日本語</a></li> <li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</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="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> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <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/> <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 #!/bin/sh
PROTOCOL=$1
DOMAIN=$2
modify_htaccess() modify_htaccess()
{ {
...@@ -33,20 +35,23 @@ modify_api() ...@@ -33,20 +35,23 @@ modify_api()
EOF EOF
} }
case "$1" in modify_htaccess "$PROTOCOL://$DOMAIN/web/"
localhost) modify_api "$PROTOCOL://$DOMAIN/acms"
modify_htaccess "http://localhost/nmoto/Sites/webviewer/"
modify_api "https://web3.agentec.jp/acms" # case "$1" in
;; # localhost)
web2) # modify_htaccess "http://localhost/nmoto/Sites/webviewer/"
modify_htaccess "https://web2.mediaservice.agentec.jp/mc/webviewer/" # modify_api "https://web3.agentec.jp/acms"
modify_api "https://web2.mediaservice.agentec.jp/mc" # ;;
;; # web2)
web3) # modify_htaccess "https://web2.mediaservice.agentec.jp/mc/webviewer/"
modify_htaccess "https://web3.agentec.jp/web/" # modify_api "https://web2.mediaservice.agentec.jp/mc"
modify_api "https://web3.agentec.jp/acms" # ;;
;; # web3)
*) # modify_htaccess "https://web3.agentec.jp/web/"
echo $"Usage: $0 {localhost|web2|web3}" # modify_api "https://web3.agentec.jp/acms"
;; # ;;
esac # *)
# echo $"Usage: $0 {localhost|web2|web3}"
# ;;
# esac
login.html
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
<li class="kor"><a id="language-ko">한국어</a></li> <li class="kor"><a id="language-ko">한국어</a></li>
</ul> </ul>
</div> </div>
<div class="manual_link"><a id="manual" href="usermanual.html" target="_manual">Manual</a></div>
</div> </div>
</header> </header>
<div class="wrapper"> <div class="wrapper">
......
usermanual.html 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
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