diff --git a/html/install/css/admin_contents.css b/html/install/css/admin_contents.css index 740b11f144..8fca29559a 100644 --- a/html/install/css/admin_contents.css +++ b/html/install/css/admin_contents.css @@ -5,48 +5,17 @@ padding: 0; } - -/* 上記による Fierfox 2 崩れ対応 */ -option { - margin-right: 0.5em; -} - -html { - height: 100%; -} - body { - width: 100%; - height: 100%; background: #fff; font-family: "ＭＳ Ｐゴシック","Hiragino Maru Gothic Pro","ヒラギノ丸ゴ Pro W4",Osaka,sans-serif; font-size: 80%; line-height: 120%; } -option { - margin-right: 3px; +select, input, textarea { font-size: 100%; } -input, textarea { - margin-right: 3px; - font-size: 100%; -} - -select { - font-size: 100%; -} -select.top, -input.top, -textarea.top{ - margin-bottom: 5px; -} - -.page_rows{ - margin-bottom:20px; -} - img { border: 0; } @@ -59,7 +28,8 @@ hr { display: none; } -/*テーブル設定*/ +/* テーブル */ + table { margin: 0 0 20px; border-collapse: collapse; @@ -75,135 +45,93 @@ th, td { th { width: 240px; - background: url('../img/table_back.png') repeat-x #f4f5f5; + background: #f5f5f5; font-weight: normal; text-align: left; } -.contents-main .btn-area, #popup .btn-area, #form_edit .btn-area{ - margin : 0px 0 60px 0; +.contents-main .btn-area, #popup .btn-area, #form_edit .btn-area { + margin: 0px 0 60px 0; padding: 20px 0; clear: both; width: 100%; - background:#f5f5f5; + background: #f5f5f5; text-align: center; } -.contents-main .btn-area li, #popup .btn-area li, .btn-area li{ - margin-right: 10px; - display: inline; -} - +/* ボタン */ -/*通常ボタン*/ -.btn-normal, a.btn-normal:link, a.btn-normal:visited { - margin-right: 5px; - padding: 2px 10px; +.btn { + padding: 1ex; border: solid 1px #bcbecb; display: inline-block; - color: #444757; - background-image: url('../img/white-grad.png'); - background-attachment: scroll; + background-image: linear-gradient(#fff, #eee); background-clip: border-box; - background-color: #eee; font-weight: normal; font-size: 90%; text-decoration: none; white-space: nowrap; cursor: pointer; - - /* CSS3 radius */ border-radius: 5px; - /* Safari, Chrome radius */ - -webkit-box-sizing: content-box; - -webkit-border-radius: 5px; - /* Firefox radius */ - -moz-border-radius: 5px; - /* Safari, Chrome radius */ - -webkit-box-sizing: content-box; - -webkit-border-radius: 5px; - /* Firefox radius */ - -moz-border-radius: 5px; -} - -/*動作ボタン*/ -.btn-action, a.btn-action:link, a.btn-action:visited { - padding: 5px 10px; - border: solid 1px #bcbecb; - display: inline-block; - color: #444757; - background: url('../img/white-grad04.png') top repeat-x #eee; - background-attachment: scroll; - background-clip: border-box; - font-weight: normal; - font-size: 80%; - text-decoration: none; - white-space: nowrap; - cursor: pointer; - /* CSS3 radius */ - border-radius: 5px; - /* Safari, Chrome radius */ - -webkit-box-sizing: content-box; - -webkit-border-radius: 5px; - /* Firefox radius */ - -moz-border-radius: 5px; - /* Safari, Chrome radius */ - -webkit-box-sizing: content-box; - -webkit-border-radius: 5px; - /* Firefox radius */ - -moz-border-radius: 5px; -} - - -/*戻るボタン*/ -.btn-action .btn-prev { - padding: 0 0 0 20px; - display: inline-block; - background: url('../img/ico_prev.gif') left no-repeat; - font-weight: bold; - font-size: 114%; -} - - -/*進むボタン*/ -.btn-action .btn-next { - padding: 0 20px 0 0; - display: inline-block; - background: url('../img/ico_next.gif') right no-repeat; - font-weight: bold; - font-size: 114%; -} - -a.btn-normal:hover, a.btn-action:hover, a.btn-tool:hover{ - border: solid 1px #d5d7df; - color: #6d728b; -} - -a.btn-tool-format:hover{ - border: solid 1px #363a47; - color: #6b728b; -} - -a.btn:active, a.btn-normal:active { - background-image: url('../img/white-grad-active.png'); -} - - -/*LINK*/ -a:link { - color: #39c; - text-decoration: none; -} - -a:visited { - color: #39c; - text-decoration: none; -} - -a:hover { - color: #39c; - text-decoration: none; + &:link, &:visited { + color: #444757; + } + + &:hover { + border: solid 1px #d5d7df; + color: #6d728b; + } + + &:active { + background-image: linear-gradient(#eee, #fff); + } + + /* 前へ戻る、次へ進む */ + + &.prev, + &.next { + position: relative; + font-size: 91.2%; + font-weight: bold; + + &::before { + content: ""; + box-sizing: border-box; + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + display: block; + background: url("../img/ico_next.gif") right 1ex center no-repeat; + } + + &.prev { + padding-left: calc(2ex + 15px); + &::before { + transform: rotate(180deg); + } + } + + &.next { + padding-right: calc(2ex + 15px); + } + } +} + +/* LINK */ + +a { + &.btn-tool-format:hover { + border: solid 1px #363a47; + color: #6b728b; + } + + &:link, &:visited, &:hover { + color: #39c; + text-decoration: none; + } } .left { @@ -222,186 +150,150 @@ a:hover { color: #f00; } - /* コンテンツ ----------------------------------------------- */ -* html div#container { - position: relative; - height: 100%; - min-height: 100%; -} - -body > #container { - height: auto; -} - -#container { - position: relative; - min-height: 100%; -} #contents { padding: 20px 20px 100px; width: 1000px; } - /* インストールメッセージ ----------------------------------------------- */ -/*以下エラーページと共通■触るべからず*/ +/* 以下エラーページと共通■触るべからず */ #outside { - margin:0 auto; - padding:0; - text-align:center; - width:100%; + margin: 0 auto; + padding: 0; + text-align: center; + width: 100%; } #out-wrap { - margin:100px auto; + margin: 100px auto; width: 560px; + + .logo { + padding-bottom: 5px; + float: right; + } } #out-area { - width:560px; + width: 560px; text-align: left; - -} - -#out-wrap .logo { - padding-bottom: 5px; - float: right; -} - -#out-area{ - width: 558px; -} -#out-area .out-top { + border: #ccc 1px solid; + border-radius: 5px; clear: both; - width: 560px; - height: 10px; - background: url('../img/login_back_top.jpg') bottom left no-repeat; -} - -/*以上エラーページと共通■触るべからず*/ - -#out-area .contents { - width:560px; - background: url('../img/login_back_contents.gif') top left repeat-y; + padding: 10px 0 0; text-align: left; -} -#out-area .btn-area-top { - width: 560px; - height: 10px; - background: url('../img/login_back_btn_top.jpg') left no-repeat; -} -#out-area .btn-area ul { - padding: 20px 0 10px 0; - width: 560px; - text-align: center; - background: url('../img/login_back_btn_contents.jpg') top left no-repeat #f4f5f5; -} -#out-area .btn-area-bottom { - width: 560px; - height: 10px; - background: url('../img/login_back_btn_bottom.jpg') bottom left no-repeat #eeeff0; -} -#out-area .contents .block { - margin: 0 auto; - width: 520px; -} -#out-area .contents .message { - margin: 0 auto 0px auto; - padding: 5px 0; - width: 520px; - color:#444757; - font-size:100%; -} -#out-area .contents h2 { - margin: 0 auto 10px auto; - padding: 5px 0; - width: 520px; - color:#444757; - font-size:100%; - font-weight: bold; - border-bottom: solid 3px #ccc; -} -#out-area .contents .result-info01 { - margin: 0 auto 10px auto; - padding: 20px; - width: 480px; - background: #eee; - font-size: 86%; - font-weight: bold; - line-height:160%; -} -#out-area .contents .result-info02 { - margin: 0 auto; - padding-bottom: 30px; - width: 520px; -} -#out-area .contents .result-info02 p { - margin-bottom: 10px; -} -#out-area .contents .result-info02 p.action-message { - margin: 20px 0 0 0; - padding-bottom: 10px; - color:#444757; -} -.ex-text{ + .contents { + + .block { + margin: 0 auto; + width: 520px; + } + + .message { + margin: 0 auto 0px auto; + padding: 5px 0; + width: 520px; + color: #444757; + font-size: 100%; + } + + h2 { + margin: 0 auto 10px auto; + padding: 5px 0; + width: 520px; + color: #444757; + font-size: 100%; + font-weight: bold; + border-bottom: solid 3px #ccc; + } + + .result-info01 { + margin: 0 auto 10px auto; + padding: 20px; + width: 480px; + background: #eee; + font-size: 86%; + font-weight: bold; + line-height: 160%; + + .site-info-list li { + margin-bottom: 5px; + font-size: 120%; + font-weight: normal; + } + } + + .result-info02 { + margin: 0 auto; + width: 520px; + + p { + margin-bottom: 10px; + + &.action-message { + margin: 20px 0 0 0; + padding-bottom: 10px; + color: #444757; + } + } + } + } + + /* ボタンエリア */ + + .btn-area ul { + margin: 1.5em 0 0; + border-top: #ccc 1px solid; + padding: 25px 0; + text-align: center; + background: #f5f5f5; + + li { + display: inline; + + + li { + margin-left: 10px; + } + } + } +} + +/* 以上エラーページと共通■触るべからず */ + +.ex-text { color: #7c7c7c; font-size: 86%; } -#out-area .contents .result-info01 .site-info-list li { - margin-bottom: 5px; - font-size: 120%; - font-weight: normal; -} - /* EC-CUBEからのお知らせエリア ----------------------------------------------- */ -#info-area{ - margin-top:20px; +#info-area { + margin-top: 20px; width: 558px; } -/* フォーム ------------------------------------------------ */ -div.btn,p.remark { - margin: 0 0 20px 0; -} +/* FORM */ -/*FORM*/ .box470 { width: 470px; height: 300px; } + .box280 { width: 280px; height: 30px; } -/*COLOR*/ -.red { - color: #f00; -} +/* FONT */ -/*FONT*/ .bold { - font-weight:bold; -} - -/* フロート解除 */ -.clearfix:after { - display:block; - clear:both; - height:0px; - line-height:0px; - visibility:hidden; - content:"."; + font-weight: bold; } - diff --git a/html/install/img/ico_prev.gif b/html/install/img/ico_prev.gif deleted file mode 100644 index f4af260eae..0000000000 Binary files a/html/install/img/ico_prev.gif and /dev/null differ diff --git a/html/install/img/ico_prev02.gif b/html/install/img/ico_prev02.gif deleted file mode 100644 index 6eedf5749d..0000000000 Binary files a/html/install/img/ico_prev02.gif and /dev/null differ diff --git a/html/install/img/login_back_btn_bottom.jpg b/html/install/img/login_back_btn_bottom.jpg deleted file mode 100644 index a79b4c9b37..0000000000 Binary files a/html/install/img/login_back_btn_bottom.jpg and /dev/null differ diff --git a/html/install/img/login_back_btn_contents.jpg b/html/install/img/login_back_btn_contents.jpg deleted file mode 100644 index db7ec4dd99..0000000000 Binary files a/html/install/img/login_back_btn_contents.jpg and /dev/null differ diff --git a/html/install/img/login_back_btn_top.jpg b/html/install/img/login_back_btn_top.jpg deleted file mode 100644 index 64b66d5d40..0000000000 Binary files a/html/install/img/login_back_btn_top.jpg and /dev/null differ diff --git a/html/install/img/login_back_contents.gif b/html/install/img/login_back_contents.gif deleted file mode 100644 index b8631ef998..0000000000 Binary files a/html/install/img/login_back_contents.gif and /dev/null differ diff --git a/html/install/img/login_back_top.jpg b/html/install/img/login_back_top.jpg deleted file mode 100644 index f3e20eb7d7..0000000000 Binary files a/html/install/img/login_back_top.jpg and /dev/null differ diff --git a/html/install/img/table_back.png b/html/install/img/table_back.png deleted file mode 100644 index 0b6b818b7f..0000000000 Binary files a/html/install/img/table_back.png and /dev/null differ diff --git a/html/install/img/white-grad-active.png b/html/install/img/white-grad-active.png deleted file mode 100644 index 04780150b1..0000000000 Binary files a/html/install/img/white-grad-active.png and /dev/null differ diff --git a/html/install/img/white-grad.png b/html/install/img/white-grad.png deleted file mode 100644 index aaf57aa950..0000000000 Binary files a/html/install/img/white-grad.png and /dev/null differ diff --git a/html/install/img/white-grad04.png b/html/install/img/white-grad04.png deleted file mode 100644 index cd3597394c..0000000000 Binary files a/html/install/img/white-grad04.png and /dev/null differ diff --git a/html/install/templates/agreement.tpl b/html/install/templates/agreement.tpl index caec58f9e9..b04a013ae7 100644 --- a/html/install/templates/agreement.tpl +++ b/html/install/templates/agreement.tpl @@ -34,6 +34,7 @@ function fnChangeVisible(check_id, mod_id){ //--> +
@@ -103,3 +104,4 @@ function fnChangeVisible(check_id, mod_id){
+ diff --git a/html/install/templates/complete.tpl b/html/install/templates/complete.tpl index c73c42eb09..38eadded46 100644 --- a/html/install/templates/complete.tpl +++ b/html/install/templates/complete.tpl @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> +
@@ -28,7 +29,7 @@
-

EC CUBE インストールが完了しました。

+

EC-CUBE インストールが完了しました。

管理画面にログインできます。
@@ -36,11 +37,10 @@

-
-
+ diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index 0d959ed88d..0e79287b1f 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -26,7 +26,6 @@ - @@ -34,70 +33,102 @@ - - - +$(window).on('load', function() { + $('#loading').hide(); +}); +$(window).on('beforeunload',function(){ + // unload では処理されないため、beforeunload を利用している。(Chrome, Firefox で確認) + $('#loading').show(); +}); +//]]> EC-CUBEインストール + -
Loading...
-
- -
-
- -
- -
- +
+ +
+ +
+ +
+ +
+
- -
+
+ +

Loading...

+
+ + diff --git a/html/install/templates/step0.tpl b/html/install/templates/step0.tpl index aee2784b3b..496d03dda4 100644 --- a/html/install/templates/step0.tpl +++ b/html/install/templates/step0.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -36,18 +38,17 @@

[次へ進む] をクリックすると、チェックを再実行します。

-
※ 問題点を解決せずに無視して進めると、トラブルの原因となる場合があります。
+
※ 問題点を解決せずに無視して進めると、トラブルの原因となる場合があります。
必要なファイルのコピーを開始します。
-
-
+ diff --git a/html/install/templates/step0_1.tpl b/html/install/templates/step0_1.tpl index acef506083..6465916cd9 100644 --- a/html/install/templates/step0_1.tpl +++ b/html/install/templates/step0_1.tpl @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> +

必要なファイルのコピー

@@ -44,13 +45,12 @@
-
-
+ diff --git a/html/install/templates/step1.tpl b/html/install/templates/step1.tpl index 01d34f07b6..01da4d74b1 100644 --- a/html/install/templates/step1.tpl +++ b/html/install/templates/step1.tpl @@ -39,6 +39,7 @@ $(function() { }); }); +
@@ -118,7 +119,7 @@ $(function() { - checked="checked" />
+ checked="checked" />
管理機能へのアクセスをSSL経由(https)の接続に制限します。
@@ -223,12 +224,11 @@ $(function() { -
-
+ diff --git a/html/install/templates/step2.tpl b/html/install/templates/step2.tpl index 9b4f974539..f70874098e 100644 --- a/html/install/templates/step2.tpl +++ b/html/install/templates/step2.tpl @@ -32,6 +32,7 @@ function lfnChangePort(db_type) { } } +
@@ -101,13 +102,12 @@ function lfnChangePort(db_type) { -
-
+ diff --git a/html/install/templates/step3.tpl b/html/install/templates/step3.tpl index 336e186227..03cc08be60 100644 --- a/html/install/templates/step3.tpl +++ b/html/install/templates/step3.tpl @@ -38,6 +38,7 @@ //--> +
@@ -67,19 +68,18 @@ -
-
+ diff --git a/html/install/templates/step4.tpl b/html/install/templates/step4.tpl index a9335b3ed9..53e2c6c624 100644 --- a/html/install/templates/step4.tpl +++ b/html/install/templates/step4.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -53,14 +55,13 @@   -
-
+ diff --git a/html/install/templates/welcome.tpl b/html/install/templates/welcome.tpl index a97194280f..298eaaffa8 100644 --- a/html/install/templates/welcome.tpl +++ b/html/install/templates/welcome.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -29,11 +31,10 @@ EC-CUBEのインストールを開始します。 -
-
+