From 6891e363ea1c130382296a0e4eeef034a08fff70 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 15:49:54 +0200 Subject: [PATCH] beautiful toggle between cloud and settings --- css/styles.css | 72 +++++++++++++++++++++++++++++++++---- img/header_background.png | Bin 2953 -> 0 bytes img/header_background2.png | Bin 2402 -> 0 bytes js/js.js | 13 +------ templates/installation.php | 40 +++++++++------------ templates/layout.admin.php | 3 +- templates/layout.guest.php | 2 +- templates/layout.user.php | 2 +- templates/login.php | 6 ++-- 9 files changed, 89 insertions(+), 49 deletions(-) delete mode 100644 img/header_background.png delete mode 100644 img/header_background2.png diff --git a/css/styles.css b/css/styles.css index 93829b7ef9..0ee0e14bfb 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,6 +1,7 @@ * { margin:0; padding:0; border:0; } body { background-color:#fefefe; background-image:url('../img/body_background.jpg'); background-repeat:repeat-y; background-position:left top; line-height:1.6em; font:normal 80% "Lucida Grande", Arial, Verdana, sans-serif; color:#000; } -#header { height:70px; padding:0.5em 1.5em; background-image:url('../img/header_background.png'); background-repeat:repeat-x; background-position:left top; } +#header { height:70px; padding:0.5em 1.5em; background-image:url('../img/header.png'); background-repeat:repeat-x; background-position:left top; } +#body-settings #header { background-image:url('../img/header-settings.png'); } #owncloud { float:left; margin:0 0 0 2em; } h1 { margin:1em 3em 1em 0; border-bottom:1px solid #666; text-transform:uppercase; font-weight:normal; font-style:italic; color:#666; } p.center { text-align:center; } @@ -21,10 +22,22 @@ legend { padding:0 0.5em; font-size:1.2em; } div.controls { width:91%; margin:1em 1em 1em 2em; padding:0.5em 0; background-color:#f7f7f7; border:1px solid #eee; } -/* LOG IN SCREEN ------------------------------------------------------------ */ -body.login { background-image:none; background-color:#ddd; } -body.login p.info { width:16em; margin:4em auto; padding:1em; background-color:#eee; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } -#login { margin:0 auto 0 auto; padding:2em 0 0 0; background-image:url('../img/header_background2.png'); background-position:left 0; background-repeat:repeat-x; background-color:#eee; text-align:center; } +/* INSTALLATION ------------------------------------------------------------ +input [type='radio'] { display:block; } +.left { display:block; position:relative; top:2.5em; left:-19em; text-align: right; font-weight:bold; } +input[type='radio'] { padding:10em; vertical-align:middle; } +input+label { font-size:20em; font-weight:bold; vertical-align:middle + */ +legend { font-weight:bold; } +legend abbr { border-bottom:1px dotted #000; } +form a { color:#000; text-decoration:none; } + #login input[type='text'], #login input[type='password'] { display:block; margin:0 auto .5em; } + + +/* LOG IN ------------------------------------------------------------ */ +#body-login { background-image:none; background-color:#ddd; } +#body-login p.info { width:16em; margin:4em auto; padding:1em; background-color:#eee; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } +#login { margin:0 auto 0 auto; padding:2em 0 0 0; background-image:url('../img/header-login.png'); background-position:left 0; background-repeat:repeat-x; background-color:#eee; text-align:center; } #login form { margin:2.5em auto 0 auto; padding:0 0 1.5em 0; text-align:center; border-bottom:1px solid #fff; } #login h1 { margin:0; padding:2.5em 0 0 0; border:0; text-align:center; text-transform:lowercase; font-size:1.5em; } #login fieldset { background-color:transparent; border:0; } @@ -32,8 +45,53 @@ body.login p.info { width:16em; margin:4em auto; padding:1em; background-color:# #login label { font-size:1.2em; color:#fff; } #login input { width:8em; margin:0.1em; padding:0.2em 0.5em; border:1px solid #ddd; -moz-border-radius:15px; -webkit-border-radius:15px; border-radius:15px; font-size:2em; color:#666; } #login input:hover, #login input:focus { outline:0; } -#login input[type=submit] { width:5em; border:1px solid #ddd; background-color:#fff; font-size:2em; } -#login input[type=submit]:hover, #login input[type=submit]:focus { background-color:#ccc; outline:0; } +#login input[type='submit'] { width:5em; border:1px solid #ddd; background-color:#fff; font-size:2em; } +#login input[type= + + + + ownCloud + + + + + + + + + + +
+ ownCloud +
+ +
+ + +
+
+ MySQL Database + + + +
+
+ Advanced ▾ +
+

+ +

+

+
+
+
+

+
+
+
+

ownCloud is a personal cloud which runs on your own server.

+ + 'submit']:hover, #login input[type=submit]:focus { background-color:#ccc; outline:0; } /* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */ #metanav { float:right; position:relative; top:1.5em; list-style:none; margin:0; padding:0; } diff --git a/img/header_background.png b/img/header_background.png deleted file mode 100644 index d377f65186d24983acf78756db7deff093d566d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2953 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 diff --git a/img/header_background2.png b/img/header_background2.png deleted file mode 100644 index b0160e02d1f34172bd4c2e684f8716bdb71c4572..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2402 zcmV-o37z(dP)Px#24YJ`L;yJeR{(rvGGwX%000SaNLh0L01FZT01FZU(%pXi00007bV*G`2ipP( z3o-_~qeKG$00`nqL_t(&-lbaYv1~OAvoh&}I;ezZ=!E8gLRS1pVoOf;G7R_4yt{YL zS59Kfk{tZ{+wYA3@iQVK$O!I#5sY9&1cUp}*hkKfex3{l5D|eOX{P||CLkgZK{61r z&Syj*VxA8{`V;gqSfhd-L%srQ)N&opD57qz|6{#(%>GtuFvw96`E4B!2KT4YM@z0D zv%L@WxO^CE34A4~?{v+J%oQ24=CFnc$~2$lj0miwc@G5E98liUCTg!gd~Bh&A38+X z$+2T#jn3wT%$rXHBM5tPuE$;pK!eQZW0EW4u6fh%c;8-fL1La^Gu+li-yuH_zjr0m zT8W-UCui!C34JMOnC~0myum)6C#;c=O4oW7#z!YSfHmtGm3w7?oz5Bs*lA=#rv@`J z6N20$;95#tlNX+a^71#I+*RW8POA7G2E2 z<_wWBD1Yc%L$bV%C+u!)dYN^I4bJ%W2>YBhdOCh3%q2esvGMo!2nA~M?$1Ohg(%1~d&hQp*2 z3Z7|~XzgTUfS)UEDIv?l*6a~AN0Su&I6Vt|KWbmWUhC;I~+ z6vsf4w$4-pp(5B7A z7O*K}T{F*tg|;^R$%Dvq3ZsS1iUY*QN)}MeoJz(+30BU*DJ&8oolRsQF%jEFP(`6p z3DcB#67WItuKlm-tgJ!OVPNy36moDZ%!E>Chel#&CnpPU8CSuT(i@(QI$&J*^byT+ zem-XzY5L%d0FB^LYvlf3mXT7Sv41N|K|HYSknK*UdNSQ2?0h$?Izte*coA~CzPLD6 zfesZyIK^NEYV1;fAZ)Plp+H=E0m_E4`2!ME>4k(v;WRcfL+L7Z#xrmq_3VojAMwRW z6Dk?k&XC@>F|JX#xZ5zg~eG*yceiAJvT7P!fF z!v^7rIyw7PvMDs@2L~TU_f^=Lm?hNqHl&P9v;R6K?y$^Ux$T&mgPZCi-_(>!6t9a< z#7NRb-aeQZactpzpeA{uB0CbCRFF|Dfx64QQjb-HU1&4{#)PzwA52FRPk!6eXiZEZ)etxXw#ts69xCb`}EI-#lr@#7d&cN7ZdQqv@vd7sunVy)eWZq^UL#0u|z`I(KQ?^f&RU%w-+US{{)t z=xVl0%L3p9szkSE#DwiRqT)VXoQ8Ysi%Zi8>o}a|y`mT|JE1u|!+I;igG}{?(|&C1 z1k*ogwl^ZPuT(q@iB2J&-{PECV(c5XDf^O4cz#DS+f4E>>p~V26Wmp$-N0r{O*Uu` zg|u!DWPP=e&-4k5<5J{wCE2;v;nFDWjOJblok;%-If|3|4C(TKWwznbE>xIDa^_D= zqEU{Gc?2F-C8fE$<-fX{uehwx=u5fz~a+OoQXfoS^qo#uM(G@Z(qJBu$3mjfurcw);y;?2(Jy|+{>9_t6r zz2mJ$&T&qLsZ&%*uYMe4bhH&9qwGK)sEV7pqRAZ!Y7GsTM<>W2oULfrGA2uD$$oXT zX>D^>vre})H0LYekKLzz4#lZr^0_K8w5;ngLd|(;*2Yzx?^bom2Wopj39QzGz9MoI zr$NDTDeFKbPCWV#6sKccVc%hmPWODG&B=<053i=|RrXugYeF_|r~vQgJS4v$1#B*R z54RxLfdc91gD$=aoV_?2#xNHnx7wUghO|;h@edm0z<4FEP;SMwd)fZk6il-KMq^D< zjMZc8CS{58arK({2%g(y$nY3l+Fkt^-j1fyka4&U8kH@X!z}&hv)ZVm6t1?%ikT5? zy++zw4dZ?b`0xHP#pGW%-GvmwO{ zs57B-c&4x`*?+*K`w+kCwG&6BpLpv{=$M=Dy+yYD8cbM!Z0y2YL|$IYygQYTS;wUAJ$LW#j?+4 z^4YQE(?_A20Z>Eo2XC04cO$phx~PxWR+{wD*}4F`FEuFu5m0jF70CR=vtI?Lv|YO_ zwS;^8R diff --git a/js/js.js b/js/js.js index 86f5885ce6..06d4478357 100644 --- a/js/js.js +++ b/js/js.js @@ -1,15 +1,4 @@ -$(document).ready(function() { - - // Hides the user_menu div : - $('#user_menu').hide(); - - // Sets user_menu link behaviour : - $('#user_menu_link').click(function() { - $('#user').toggleClass('userLinkOn'); - $('#user_menu').slideToggle(250); - return false; - }); - +$(document).ready(function() { //hide the advanced config $('#advanced_options').hide(); $('#use_mysql').hide(); diff --git a/templates/installation.php b/templates/installation.php index be4693288b..cfbe53813e 100644 --- a/templates/installation.php +++ b/templates/installation.php @@ -1,36 +1,30 @@ -
" alt="ownCloud" /> -
+
-

-

+ +
MySQL Database -

-

-

+ + +
Advanced ▾
-

+ -

-

-

+ +
-

-

-

+ + + @@ -39,13 +33,13 @@ -

-

+ +
-

-

+ +
@@ -53,4 +47,4 @@

-
\ No newline at end of file + diff --git a/templates/layout.admin.php b/templates/layout.admin.php index 6f8b4302d3..6b1e73fd3a 100644 --- a/templates/layout.admin.php +++ b/templates/layout.admin.php @@ -12,13 +12,12 @@ - + diff --git a/templates/layout.guest.php b/templates/layout.guest.php index dc16a1183c..c957553082 100644 --- a/templates/layout.guest.php +++ b/templates/layout.guest.php @@ -12,7 +12,7 @@ - +

ownCloud is a personal cloud which runs on your own server.

diff --git a/templates/layout.user.php b/templates/layout.user.php index b03fca9308..4e9190d91f 100644 --- a/templates/layout.user.php +++ b/templates/layout.user.php @@ -12,7 +12,7 @@ - +