From e7871cb5b4c91691b859360ae6ce240c0f875c66 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Fri, 11 Oct 2013 20:44:31 +0200 Subject: [PATCH 1/4] Small design improvements --- templates/Sparkle/admin/index/index.tpl | 6 +++--- templates/Sparkle/assets/css/main.css | 16 +++++++++------- templates/Sparkle/header.tpl | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index b04666b2..2780f252 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -3,9 +3,9 @@ $header
-
-
{$lng['admin']['warning']}
-

{$awaitingtickets_text}
+
+
{$lng['admin']['note']}
+
{$awaitingtickets_text}
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 64adb1c8..f61b88d5 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -11,9 +11,10 @@ article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section { /* TYPE */ html,body { - font:12px/18px "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif; + font:12px/18px Helvetica,Arial,Verdana,sans-serif; background-color:#f2f2f2; color:#333; + -webkit-font-smoothing: antialiased; } body { @@ -64,8 +65,8 @@ td a { } .topheader { - background: #e9edf0; - background: rgba(234,238,240,0.9); + background: #fafafa; + background: rgba(250,250,250,0.9); top: 0px; width: 100%; padding: 2px 0 0 5px; @@ -75,16 +76,17 @@ td a { } .topheader_navigation { float: right; - margin: 35px 40px 0 0; + margin: 36px 50px 0 0; + text-transform: uppercase; } /* TOPHEADER NAV */ ul.topheadernav { list-style-type: none; - font-size: 14px; + font-size: 13px; } ul.topheadernav li { - padding: 0 0 0 30px; + padding: 0 0 0 50px; float: left; position: relative; } @@ -109,7 +111,7 @@ ul.topheadernav li:hover ul { } ul.topheadernav li ul li { font-size: 11px; - margin-left: -30px; + margin-left: -50px; } ul.topheadernav li ul li a:hover { color: #111; diff --git a/templates/Sparkle/header.tpl b/templates/Sparkle/header.tpl index eb47ee8f..57668873 100644 --- a/templates/Sparkle/header.tpl +++ b/templates/Sparkle/header.tpl @@ -45,7 +45,7 @@
  • {$lng['admin']['overview']}
    • -
  • {$lng['panel']['options']} +
  • {$lng['panel']['options']} ▾
    • {$lng['login']['password']}
    • {$lng['login']['language']}
      • From 2ba1c1eb422a3169886bcde9e23c8da8cf1094a1 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Sat, 12 Oct 2013 15:09:33 +0200 Subject: [PATCH 2/4] Fixed wrong icons --- templates/Sparkle/admin/aps/manage_instances.tpl | 4 ++-- templates/Sparkle/admin/aps/manage_packages.tpl | 4 ++-- templates/Sparkle/admin/aps/manage_packages_download.tpl | 2 +- templates/Sparkle/admin/aps/upload.tpl | 2 +- templates/Sparkle/admin/phpconfig/overview.tpl | 2 +- templates/Sparkle/customer/aps/installer.tpl | 2 +- templates/Sparkle/customer/aps/package.tpl | 2 +- templates/Sparkle/customer/aps/package_status.tpl | 2 +- templates/Sparkle/customer/aps/search.tpl | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/Sparkle/admin/aps/manage_instances.tpl b/templates/Sparkle/admin/aps/manage_instances.tpl index 43cbbbd4..ee3215da 100644 --- a/templates/Sparkle/admin/aps/manage_instances.tpl +++ b/templates/Sparkle/admin/aps/manage_instances.tpl @@ -1,7 +1,7 @@

      -   +   {$lng['aps']['specialoptions']}

      @@ -21,7 +21,7 @@

      -   +   {$lng['aps']['manageinstances']}

      diff --git a/templates/Sparkle/admin/aps/manage_packages.tpl b/templates/Sparkle/admin/aps/manage_packages.tpl index e9cbcce7..512b472a 100644 --- a/templates/Sparkle/admin/aps/manage_packages.tpl +++ b/templates/Sparkle/admin/aps/manage_packages.tpl @@ -1,7 +1,7 @@

      -   +   {$lng['aps']['specialoptions']}

      @@ -62,7 +62,7 @@

      -   +   {$lng['aps']['managepackages']}

      diff --git a/templates/Sparkle/admin/aps/manage_packages_download.tpl b/templates/Sparkle/admin/aps/manage_packages_download.tpl index 2db11f92..f20eed37 100644 --- a/templates/Sparkle/admin/aps/manage_packages_download.tpl +++ b/templates/Sparkle/admin/aps/manage_packages_download.tpl @@ -1,7 +1,7 @@

      -   +   {$lng['aps']['specialoptions']}

      diff --git a/templates/Sparkle/admin/aps/upload.tpl b/templates/Sparkle/admin/aps/upload.tpl index 6ef5982e..a07e5564 100644 --- a/templates/Sparkle/admin/aps/upload.tpl +++ b/templates/Sparkle/admin/aps/upload.tpl @@ -1,7 +1,7 @@

      -   +   {$lng['aps']['upload']}

      diff --git a/templates/Sparkle/admin/phpconfig/overview.tpl b/templates/Sparkle/admin/phpconfig/overview.tpl index 9f2311a4..1839a598 100644 --- a/templates/Sparkle/admin/phpconfig/overview.tpl +++ b/templates/Sparkle/admin/phpconfig/overview.tpl @@ -2,7 +2,7 @@ $header

      -   +   {$lng['menue']['phpsettings']['maintitle']}

      diff --git a/templates/Sparkle/customer/aps/installer.tpl b/templates/Sparkle/customer/aps/installer.tpl index ef936318..21bcc03b 100644 --- a/templates/Sparkle/customer/aps/installer.tpl +++ b/templates/Sparkle/customer/aps/installer.tpl @@ -1,7 +1,7 @@

      - {$Xml->name}  + {$Xml->name}  {$Xml->name}

      diff --git a/templates/Sparkle/customer/aps/package.tpl b/templates/Sparkle/customer/aps/package.tpl index 18f6204e..7aada2b8 100644 --- a/templates/Sparkle/customer/aps/package.tpl +++ b/templates/Sparkle/customer/aps/package.tpl @@ -1,7 +1,7 @@

      - {$Xml->name}  + {$Xml->name}  {$Xml->name}

      diff --git a/templates/Sparkle/customer/aps/package_status.tpl b/templates/Sparkle/customer/aps/package_status.tpl index 35982810..9979c274 100644 --- a/templates/Sparkle/customer/aps/package_status.tpl +++ b/templates/Sparkle/customer/aps/package_status.tpl @@ -1,7 +1,7 @@

      - {$Xml->name}  + {$Xml->name}  {$Xml->name}

      diff --git a/templates/Sparkle/customer/aps/search.tpl b/templates/Sparkle/customer/aps/search.tpl index 97ec712a..dee840fb 100644 --- a/templates/Sparkle/customer/aps/search.tpl +++ b/templates/Sparkle/customer/aps/search.tpl @@ -1,7 +1,7 @@

      -   +   {$lng['aps']['search']}

      From 82b109d170f3afc67b3ef070e912e2b62317ce34 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Sun, 13 Oct 2013 10:49:31 +0200 Subject: [PATCH 3/4] CSS fixes and tweaks --- templates/Sparkle/assets/css/main.css | 14 +++++++++++--- templates/Sparkle/misc/alreadyinstalledhint.tpl | 6 ++++-- templates/Sparkle/misc/configurehint.tpl | 5 +++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index f61b88d5..7f3584a8 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -147,6 +147,10 @@ footer a,footer a:active,footer a:visited { margin-bottom: 12px; width: 600px; } +.login div.warningcontainer, .login div.errorcontainer, .login div.successcontainer { + margin: 10px !important; +} + .install { width: 800px; } @@ -288,15 +292,18 @@ p.submit { clear:both; float:none; width:auto; - text-align:left; - padding-top:10px; - padding-left:10px; + text-align: left; + padding: 10px 10px 0 10px; } .installsec aside { text-align: right; padding: 10px; } +aside.right { + text-align: right; +} + .messagewrapper { width:650px; margin:0 auto; @@ -346,6 +353,7 @@ p.submit { color:#c00!important; } + /* * warning message display */ diff --git a/templates/Sparkle/misc/alreadyinstalledhint.tpl b/templates/Sparkle/misc/alreadyinstalledhint.tpl index 3f206c41..e2baaff7 100644 --- a/templates/Sparkle/misc/alreadyinstalledhint.tpl +++ b/templates/Sparkle/misc/alreadyinstalledhint.tpl @@ -28,12 +28,14 @@

      Welcome to Froxlor

      It seems that Froxlor has already been configured.

      Click on the link below to go to the login page.

      -

      +

       

      +
      +