Merge branch 'sbb' of gitlab.agentec.jp:abook_web/web-viewer into sbb

abvw/bookmark.html

@@ -94,13 +94,13 @@
         </div>
         
         <section id="pnlTop" class='top'>
-            <div id="dspDelete">選択したしおりを <a class="delete lang" lang="dspDelete">削除</a></div>
+            <div id="dspDelete"><a class="delete lang" lang="dspDelete">削除</a></div>
         </section>
         
         <div class="shioriNotExist lang" id="msgShioriNotExists" lang="msgShioriNotExists"></div>
         
         <section id="bottom">
-            <div id="dspDelete1">選択したしおりを <a class="delete lang" lang="dspDelete">削除</a></div>
+            <div id="dspDelete1"><a class="delete lang" lang="dspDelete">削除</a></div>
         </section>
     </article>
     

abvw/common/json/lang/lang-en.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"Logout",
 "txtSearchResult":"Result",
 "dspHome":"Home",
-"txtLoginUser":"(Ver.20130516_01):",
+"txtLoginUser":"(Ver.20130517_01):",
 "txtAll":"All",
 "txtMkgSize":"Size",
 "txtMkgS":"S",

abvw/common/json/lang/lang-in.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"Logout tanpa back-up",
 "txtSearchResult":"Hasil pencarian",
 "dspHome":"Beranda",
-"txtLoginUser":"(Ver.20130516_01):",
+"txtLoginUser":"(Ver.20130517_01):",
 "txtAll":"Semua",
 "txtMkgSize":"Ukuran",
 "txtMkgS":"Kecil",

abvw/common/json/lang/lang-ja.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"バックアップせずにログアウト",
 "txtSearchResult":"検索結果",
 "dspHome":"ホーム",
-"txtLoginUser":"(Ver.20130514_01):",
+"txtLoginUser":"(Ver.20130517_01):",
 "txtAll":"すべて",
 "txtMkgSize":"太さ",
 "txtMkgS":"小",

abvw/common/json/lang/lang-ko.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"로그아웃",
 "txtSearchResult":"검색 결과",
 "dspHome":"홈",
-"txtLoginUser":"(Ver.20130516_01):",
+"txtLoginUser":"(Ver.20130517_01):",
 "txtAll":"전체",
 "txtMkgSize":"두께",
 "txtMkgS":"소",

abvw/common/json/lang/lang-th.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"ล็อกเอ้าท์โดยไม่สำรองข้อมูล",
 "txtSearchResult":"ผลการค้นหา",
 "dspHome":"หน้าหลัก",
-"txtLoginUser":"(Ver.20130516_01):",
+"txtLoginUser":"(Ver.20130517_01):",
 "txtAll":"ทั้งหมด",
 "txtMkgSize":"ขนาด",
 "txtMkgS":"เล็ก",

abvw/css/viewer.css

@@ -187,6 +187,7 @@ header{
 	height:60px;
 	overflow:hidden;
 	float:right;
+	margin:0 20px;
 /*	padding-right:100px;*/
 }
 .hdRcolumn input{