From d076c22e284e8ff59024ffc3520368fc0cfe9fad Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 12:38:32 +0200 Subject: [PATCH 01/15] integrated help to settings navigation --- help/appinfo/app.php | 2 +- help/index.php | 2 +- help/templates/index.php | 7 ------- log/templates/index.php | 7 ------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/help/appinfo/app.php b/help/appinfo/app.php index c4e9eb5717c..12ae59b94c2 100644 --- a/help/appinfo/app.php +++ b/help/appinfo/app.php @@ -1,6 +1,6 @@ 1, "id" => "help", "name" => "Help" )); -OC_APP::addSettingsPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" ))); +OC_APP::addSettingsPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "settings", "information.png" ))); ?> diff --git a/help/index.php b/help/index.php index bed0ac7b6bb..426abe39560 100644 --- a/help/index.php +++ b/help/index.php @@ -15,7 +15,7 @@ OC_APP::setActiveNavigationEntry( "help" ); $kbe=OC_OCSCLIENT::getKnownledgebaseEntries(); -$tmpl = new OC_TEMPLATE( "help", "index", "user" ); +$tmpl = new OC_TEMPLATE( "help", "index", "admin" ); $tmpl->assign( "kbe", $kbe ); $tmpl->printPage(); diff --git a/help/templates/index.php b/help/templates/index.php index 5ff414eb4a7..51b673678d3 100644 --- a/help/templates/index.php +++ b/help/templates/index.php @@ -1,10 +1,3 @@ - -

Help

- diff --git a/log/templates/index.php b/log/templates/index.php index 02fea0f87b0..e8a259cbaba 100644 --- a/log/templates/index.php +++ b/log/templates/index.php @@ -1,10 +1,3 @@ - -

Logs

-

From 86356e888ecdcb80cde46c531305eef63cc49911 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 17 Apr 2011 15:25:51 +0200 Subject: [PATCH 02/15] save the correct config entry --- lib/installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/installer.php b/lib/installer.php index 14e2be6600f..965642e8476 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -68,7 +68,7 @@ class OC_INSTALLER{ self::createDBUser($username,$password,$connection); //use the admin login data for the new database user OC_CONFIG::setValue('dbuser',$username); - OC_CONFIG::setValue('dbpass',$password); + OC_CONFIG::setValue('dbpassword',$password); //create the database self::createDatabase($dbname,$username,$connection); From 6891e363ea1c130382296a0e4eeef034a08fff70 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 15:49:54 +0200 Subject: [PATCH 03/15] 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 93829b7ef96..0ee0e14bfb5 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 86f5885ce62..06d4478357c 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 be4693288b2..cfbe53813e0 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 6f8b4302d3a..6b1e73fd3a4 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 dc16a1183c9..c9575530820 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 b03fca93082..4e9190d91ff 100644 --- a/templates/layout.user.php +++ b/templates/layout.user.php @@ -12,7 +12,7 @@ - + From 4b0a3163c8e7b89f51c130736cdb5fa98a934ded Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 15:50:29 +0200 Subject: [PATCH 04/15] beautiful actual addition of files --- img/header-login.png | Bin 0 -> 2402 bytes img/header-settings.png | Bin 0 -> 2887 bytes img/header.png | Bin 0 -> 2953 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 img/header-login.png create mode 100644 img/header-settings.png create mode 100644 img/header.png diff --git a/img/header-login.png b/img/header-login.png new file mode 100644 index 0000000000000000000000000000000000000000..b0160e02d1f34172bd4c2e684f8716bdb71c4572 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/img/header-settings.png b/img/header-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..7e6b70b5903bcdfb2422e225cf4c17bd2af8ca6e GIT binary patch literal 2887 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 literal 0 HcmV?d00001 diff --git a/img/header.png b/img/header.png new file mode 100644 index 0000000000000000000000000000000000000000..d377f65186d24983acf78756db7deff093d566d4 GIT binary patch literal 2953 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 literal 0 HcmV?d00001 From ee4d087e72ab9a91baf0681a5d4ee6582ba4fd37 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sun, 17 Apr 2011 15:59:06 +0200 Subject: [PATCH 05/15] don't reload the whole page after file upload --- files/ajax/list.php | 37 ++++++++++++++++++++++++++----------- files/index.php | 11 ++++++++--- files/js/files.js | 24 +++++++++++++++++++++++- files/templates/index.php | 17 +++-------------- 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/files/ajax/list.php b/files/ajax/list.php index 4694f842832..ef43e72fcae 100644 --- a/files/ajax/list.php +++ b/files/ajax/list.php @@ -2,6 +2,7 @@ // Init owncloud require_once('../../lib/base.php'); +require_once('../../lib/template.php'); // We send json data header( "Content-Type: application/jsonrequest" ); @@ -14,23 +15,37 @@ if( !OC_USER::isLoggedIn()){ // Load the files $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; +$doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false; +$data = array(); +// Make breadcrumb +if($doBreadcrumb){ + $breadcrumb = array(); + $pathtohere = "/"; + foreach( explode( "/", $dir ) as $i ){ + if( $i != "" ){ + $pathtohere .= "$i/"; + $breadcrumb[] = array( "dir" => $pathtohere, "name" => $i ); + } + } + + $breadcrumbNav = new OC_TEMPLATE( "files", "part.breadcrumb", "" ); + $breadcrumbNav->assign( "breadcrumb", $breadcrumb ); + + $data['breadcrumb'] = $breadcrumbNav->fetchPage(); +} + +// make filelist $files = array(); foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){ - $i["date"] = date( $CONFIG_DATEFORMAT, $i["mtime"] ); + $i["date"] = OC_UTIL::formatDate($i["mtime"] ); $files[] = $i; } -// Make breadcrumb -$breadcrumb = array(); -$pathtohere = "/"; -foreach( explode( "/", $dir ) as $i ){ - if( $i != "" ){ - $pathtohere .= "$i/"; - $breadcrumb[] = array( "dir" => $pathtohere, "name" => $i ); - } -} +$list = new OC_TEMPLATE( "files", "part.list", "" ); +$list->assign( "files", $files ); +$data = array('files' => $list->fetchPage()); -echo json_encode( array( "status" => "success", "data" => array( "files" => $files, "breadcrumb" => $breadcrumb ))); +echo json_encode( array( "status" => "success", "data" => $data)); ?> diff --git a/files/index.php b/files/index.php index e07e80aabb5..28743f77fca 100644 --- a/files/index.php +++ b/files/index.php @@ -55,10 +55,15 @@ foreach( explode( "/", $dir ) as $i ){ } } -// return template +// make breadcrumb und filelist markup +$list = new OC_TEMPLATE( "files", "part.list", "" ); +$list->assign( "files", $files ); +$breadcrumbNav = new OC_TEMPLATE( "files", "part.breadcrumb", "" ); +$breadcrumbNav->assign( "breadcrumb", $breadcrumb ); + $tmpl = new OC_TEMPLATE( "files", "index", "user" ); -$tmpl->assign( "files", $files ); -$tmpl->assign( "breadcrumb", $breadcrumb ); +$tmpl->assign( "fileList", $list->fetchPage() ); +$tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() ); $tmpl->assign( 'dir', $dir); $tmpl->assign( 'uploadMaxFilesize', OC_HELPER::computerFileSize(ini_get('upload_max_filesize'))); $tmpl->printPage(); diff --git a/files/js/files.js b/files/js/files.js index 9eeeb7f6bfd..44506763032 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -55,6 +55,28 @@ function uploadFinished() { if(result.status == "error") { alert('An error occcured, upload failed.\nError code: ' + result.data.error); } else { - location.href = 'index.php?dir=' + $('#dir').val(); + dir = $('#dir').val(); + $.ajax({ + url: 'ajax/list.php', + data: "dir="+dir, + complete: refreshContents + }); } } + +function refreshContents(data) { + result = eval("("+data.responseText+");"); + if(typeof(result.data.breadcrumb) != 'undefined'){ + updateBreadcrumb(result.data.breadcrumb); + } + updateFileList(result.data.files); + $('#file_upload_button').click(); +} + +function updateBreadcrumb(breadcrumbHtml) { + $('p.nav').empty().html(breadcrumbHtml); +} + +function updateFileList(fileListHtml) { + $('#fileList').empty().html(fileListHtml); +} diff --git a/files/templates/index.php b/files/templates/index.php index 40113c9fe0c..5277441b535 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -17,10 +17,7 @@ name="file_upload_target" src="">

- ">" alt="Root" /> - - "> - +

@@ -33,16 +30,8 @@ name="file_upload_target" src=""> - - - - - - - - - - + +
)" href="" title="">+
From 5759802091d416563d27ab3540115d49e8e16b0d Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sun, 17 Apr 2011 16:04:46 +0200 Subject: [PATCH 06/15] now we have our own ocs server --- lib/ocsclient.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 71a0b1279ab..994a889aecf 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -35,16 +35,22 @@ class OC_OCSCLIENT{ * This function returns a list of all the application categories on the OCS server */ public static function getCategories(){ - $url='http://api.opendesktop.org/v1/content/categories'; + $url='http://api.apps.owncloud.com/v1/content/categories'; $xml=file_get_contents($url); $data=simplexml_load_string($xml); - $tmp=$data->data->category; + $tmp=$data->data; $cats=array(); - for($i = 0; $i < count($tmp); $i++) { - $cats[$i]=$tmp[$i]->name; + + foreach($tmp->category as $key=>$value) { + + $id= (int) $value->id; + $name= (string) $value->name; + $cats[$id]=$name; + } + return $cats; } @@ -60,8 +66,7 @@ class OC_OCSCLIENT{ }else{ $categoriesstring=$categories; } - $url='http://api.opendesktop.org/v1/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page=0&pagesize=10'; - + $url='http://api.apps.owncloud.com/v1/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page=0&pagesize=10'; $apps=array(); $xml=file_get_contents($url); $data=simplexml_load_string($xml); @@ -92,7 +97,7 @@ class OC_OCSCLIENT{ * This function returns an applications from the OCS server */ public static function getApplication($id){ - $url='http://api.opendesktop.org/v1/content/data/'.urlencode($id); + $url='http://api.apps.owncloud.com/v1/content/data/'.urlencode($id); $xml=file_get_contents($url); $data=simplexml_load_string($xml); @@ -121,7 +126,7 @@ class OC_OCSCLIENT{ * This function returns a list of all the knowledgebase entries from the OCS server */ public static function getKnownledgebaseEntries(){ - $url='http://api.opendesktop.org/v1/knowledgebase/data?page=0&pagesize=10'; + $url='http://api.apps.owncloud.com/v1/knowledgebase/data?page=0&pagesize=10'; $kbe=array(); $xml=file_get_contents($url); From 270e1101f4e6dabb8ea578282bedd5476ca2e9f0 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sun, 17 Apr 2011 16:19:21 +0200 Subject: [PATCH 07/15] some forgotten files... --- files/css/files.css | 4 ++++ files/templates/index.php | 2 ++ files/templates/part.breadcrumb.php | 4 ++++ files/templates/part.list.php | 9 +++++++++ 4 files changed, 19 insertions(+) create mode 100644 files/templates/part.breadcrumb.php create mode 100644 files/templates/part.list.php diff --git a/files/css/files.css b/files/css/files.css index 160c9307409..1d7fb5ef592 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -27,6 +27,10 @@ display: none; } +#file_action_panel { + display: none; +} + /* FILE TABLE */ table td.filesize, table td.date diff --git a/files/templates/index.php b/files/templates/index.php index 5277441b535..28187bcb531 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -14,6 +14,8 @@ type="file" name="file" id="fileSelector"> +
+

diff --git a/files/templates/part.breadcrumb.php b/files/templates/part.breadcrumb.php new file mode 100644 index 00000000000..4d11edb984a --- /dev/null +++ b/files/templates/part.breadcrumb.php @@ -0,0 +1,4 @@ + ">" alt="Root" /> + + "> + \ No newline at end of file diff --git a/files/templates/part.list.php b/files/templates/part.list.php new file mode 100644 index 00000000000..76d938326b6 --- /dev/null +++ b/files/templates/part.list.php @@ -0,0 +1,9 @@ + + + + )" href="" title=""> + + + + + + \ No newline at end of file From c192af186d0d193bb5d66efd8f6b64ab3bb51f3e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 16:24:59 +0200 Subject: [PATCH 08/15] removed HTML from CSS I put there last time. Also fixed header and navigation --- css/styles.css | 57 +++++--------------------------------- img/header-a.png | Bin 0 -> 2951 bytes img/header-settings-a.png | Bin 0 -> 2885 bytes 3 files changed, 7 insertions(+), 50 deletions(-) create mode 100644 img/header-a.png create mode 100644 img/header-settings-a.png diff --git a/css/styles.css b/css/styles.css index 0ee0e14bfb5..8f8fa693f10 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,7 +1,9 @@ * { 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.png'); background-repeat:repeat-x; background-position:left top; } -#body-settings #header { background-image:url('../img/header-settings.png'); } +#header { position:fixed; width:100%; height:5.5em; padding:0.5em 1.5em; background-image:url('../img/header-a.png'); background-repeat:repeat-x; background-position:left top; } +#plugins { position:fixed; } +#main { margin-top:7em; } +#body-settings #header { background-image:url('../img/header-settings-a.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; } @@ -46,58 +48,13 @@ form a { color:#000; text-decoration:none; } #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= - - - - 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; } +#login input[type='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; } +#metanav { float:right; position:relative; top:1.5em; right:2.5em; list-style:none; margin:0; padding:0; } #metanav li { display:inline; } #metanav li a { margin:.1em; padding:1em; } -#metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; outline:0; box-shadow:#444 0 1px 0; -moz-box-shadow:#444 0 1px 0; -webkit-box-shadow:#444 0 1px 0; } +#metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; outline:0; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; } #metanav li a img { vertical-align:middle; } /* PLUGINS MENU ------------------------------------------------------------- */ diff --git a/img/header-a.png b/img/header-a.png new file mode 100644 index 0000000000000000000000000000000000000000..46fb0977ee2c49444c29312c48acacc4d826131f GIT binary patch literal 2951 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 literal 0 HcmV?d00001 diff --git a/img/header-settings-a.png b/img/header-settings-a.png new file mode 100644 index 0000000000000000000000000000000000000000..a72271be6a48d44a21a26e99f1e7d69dcbfd802e GIT binary patch literal 2885 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 literal 0 HcmV?d00001 From f7c708b22a12c976e8cd413c83d10deaf1268d64 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 16:31:58 +0200 Subject: [PATCH 09/15] fixing header layout bug --- css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 8f8fa693f10..ba6f5bf2c36 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,6 +1,6 @@ * { 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 { position:fixed; width:100%; height:5.5em; padding:0.5em 1.5em; background-image:url('../img/header-a.png'); background-repeat:repeat-x; background-position:left top; } +body { position:absolute; background:#fefefe url('../img/body_background.jpg') repeat-y left top; line-height:1.6em; font:normal 80% "Lucida Grande", Arial, Verdana, sans-serif; color:#000; } +#header { position:fixed; width:100%; height:5.5em; padding:0.5em 1.5em; background:url('../img/header-a.png') repeat-x left top; } #plugins { position:fixed; } #main { margin-top:7em; } #body-settings #header { background-image:url('../img/header-settings-a.png'); } From 225ad85e909b3f65d8eda57ef13001b0000e4e76 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 17 Apr 2011 16:40:44 +0200 Subject: [PATCH 10/15] add free_space to OC_FILESYSTEM --- lib/filestorage.php | 5 +++++ lib/filesystem.php | 6 ++++++ settings/index.php | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/filestorage.php b/lib/filestorage.php index 66b91fc19aa..5161e7f0e57 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -75,6 +75,7 @@ class OC_FILESTORAGE{ public function find($path){} public function getTree($path){} public function hash($type,$path,$raw){} + public function free_space($path){} } @@ -466,6 +467,10 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{ } return $return; } + + public function free_space($path){ + return disk_free_space($this->datadir.$path); + } /** * @brief get the size of folder and it's content diff --git a/lib/filesystem.php b/lib/filesystem.php index 54b2ad9ce77..033f50e2aba 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -386,5 +386,11 @@ class OC_FILESYSTEM{ return $storage->hash($type,self::getInternalPath($path),$raw); } } + + static public function free_space($path='/'){ + if(self::canRead($path) and $storage=self::getStorage($path)){ + return $storage->free_space($path); + } + } } ?> diff --git a/settings/index.php b/settings/index.php index 521f2ade9da..0e3b3f28550 100644 --- a/settings/index.php +++ b/settings/index.php @@ -10,7 +10,7 @@ if( !OC_USER::isLoggedIn()){ $tmpl = new OC_TEMPLATE( "settings", "index", "admin"); $used=OC_FILESYSTEM::filesize('/'); -$free=disk_free_space(OC_CONFIG::getValue('datadirectory')); +$free=OC_FILESYSTEM::free_space(); $total=$free+$used; $relative=round(($used/$total)*100); $tmpl->assign('usage',OC_HELPER::humanFileSize($used)); From 023c1b2f19ecb3fe1f7ccbda57e73dd476c249e2 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 16:49:34 +0200 Subject: [PATCH 11/15] fixing login screen width --- css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index ba6f5bf2c36..eace46635e9 100644 --- a/css/styles.css +++ b/css/styles.css @@ -37,9 +37,9 @@ form a { color:#000; text-decoration:none; } /* LOG IN ------------------------------------------------------------ */ -#body-login { background-image:none; background-color:#ddd; } +#body-login { width:100%; 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 { margin:0 auto 0 auto; padding:2em 0 0 0; background:#eee url('../img/header-login.png') repeat-x left 0; 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; } From 60b682561254797330110693705b2c36dd7928a4 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sun, 17 Apr 2011 17:38:35 +0200 Subject: [PATCH 12/15] show only ownCloud related knowledgebase entries. and make the page pretty --- admin/templates/app.php | 2 +- help/css/help.css | 6 +++--- help/templates/index.php | 12 ++++++++++-- lib/ocsclient.php | 3 ++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/admin/templates/app.php b/admin/templates/app.php index 4b5740c2bc4..9a788cf64c4 100644 --- a/admin/templates/app.php +++ b/admin/templates/app.php @@ -19,7 +19,7 @@ $app=$_['app'];
- read more
'); ?> + read more
'); ?> INSTALL diff --git a/help/css/help.css b/help/css/help.css index 02bcade3cc2..9e64c28afb4 100644 --- a/help/css/help.css +++ b/help/css/help.css @@ -49,16 +49,16 @@ table td.name a } -.install a { +.button a { padding:0.2em 0.5em; border:1px solid #ddd; -moz-border-radius:15px; -webkit-border-radius:15px; border-radius:15px; text-decoration: none; - font-size:1.5em; color:#666666; + font-size:1.3em; color:#666666; background-color:#F0F0F0; } -.install a:hover { +.button a:hover { background-color:#DDDDDD; } diff --git a/help/templates/index.php b/help/templates/index.php index 51b673678d3..776d7c00a9e 100644 --- a/help/templates/index.php +++ b/help/templates/index.php @@ -1,10 +1,18 @@ + +

Questions and Answers

+ - - + +
"") { echo(''); } ?> " title="">
'.$kb['description'].''); ?>		 "") { echo(''); } ?>
'.$kb['description'].''); ?>
+ '') echo('
Answer:
'.$kb['answer'].'');?> +
+ASK A QUESTION + + diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 994a889aecf..a3c4659c6e4 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -126,7 +126,7 @@ class OC_OCSCLIENT{ * This function returns a list of all the knowledgebase entries from the OCS server */ public static function getKnownledgebaseEntries(){ - $url='http://api.apps.owncloud.com/v1/knowledgebase/data?page=0&pagesize=10'; + $url='http://api.apps.owncloud.com/v1/knowledgebase/data?type=150&page=0&pagesize=10'; $kbe=array(); $xml=file_get_contents($url); @@ -138,6 +138,7 @@ class OC_OCSCLIENT{ $kb['id']=$tmp[$i]->id; $kb['name']=$tmp[$i]->name; $kb['description']=$tmp[$i]->description; + $kb['answer']=$tmp[$i]->answer; $kb['preview1']=$tmp[$i]->smallpreviewpic1; $kbe[]=$kb; } From 9b26cb0bfb6c6b3aab03eb3320a9a9917786f1ac Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sun, 17 Apr 2011 17:49:56 +0200 Subject: [PATCH 13/15] implement "new folder" function --- files/ajax/newfolder.php | 29 ++++++++++++++++++ files/css/files.css | 4 +-- files/js/files.js | 62 ++++++++++++++++++++++++++++++++++----- files/templates/index.php | 7 ++--- 4 files changed, 89 insertions(+), 13 deletions(-) create mode 100644 files/ajax/newfolder.php diff --git a/files/ajax/newfolder.php b/files/ajax/newfolder.php new file mode 100644 index 00000000000..988e7f04012 --- /dev/null +++ b/files/ajax/newfolder.php @@ -0,0 +1,29 @@ + "error", "data" => array( "message" => "Authentication error" ))); + exit(); +} + +// Get the params +$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; +$foldername = isset( $_GET['foldername'] ) ? $_GET['foldername'] : ''; + +if($foldername == '') { + echo json_encode( array( "status" => "error", "data" => array( "message" => "Empty Foldername" ))); + exit(); +} +error_log('try to create ' . $foldername . ' in ' . $dir); +if(OC_FILES::newFile($dir, $foldername, 'dir')) { + echo json_encode( array( "status" => "success", "data" => array())); + exit(); +} + +echo json_encode( array( "status" => "error", "data" => array( "message" => "Error when creating the folder" ))); \ No newline at end of file diff --git a/files/css/files.css b/files/css/files.css index 1d7fb5ef592..4c5bd0427b6 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -23,11 +23,11 @@ display: none; } -#file_upload_target { +#file_newfolder_form { display: none; } -#file_action_panel { +#file_upload_target { display: none; } diff --git a/files/js/files.js b/files/js/files.js index 44506763032..313727cedbc 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -1,4 +1,6 @@ $(document).ready(function() { + $('#file_action_panel').attr('activeAction', false); + // Sets browser table behaviour : $('.browser tr').hover( function() { @@ -37,16 +39,43 @@ $(document).ready(function() { $('.browser input:checkbox').attr('checked', false); }); - // Shows and hides file upload form - $('#file_upload_button').toggle(function() { - $('#file_upload_form').css({"display":"block"}); - }, function() { - $('#file_upload_form').css({"display":"none"}); - }); - $('#file_upload_start').click(function() { $('#file_upload_target').load(uploadFinished); }); + + $('#file_new_dir_submit').click(function() { + $.ajax({ + url: 'ajax/newfolder.php', + data: "dir="+$('#dir').val()+"&foldername="+$('#file_new_dir_name').val(), + complete: boolOpFinished + }); + }); + + $('.upload').click(function(){ + if($('#file_action_panel').attr('activeAction') != 'upload') { + $('#file_action_panel').attr('activeAction', 'upload'); + $('#fileSelector').replaceWith(''); + $('#file_action_panel form').css({"display":"none"}); + $('#file_upload_form').css({"display":"block"}); + } else { + $('#file_action_panel').attr('activeAction', 'false'); + $('#file_upload_form').css({"display":"none"}) + } + return false; + }); + + $('.new-dir').click(function(){ + if($('#file_action_panel').attr('activeAction') != 'new-dir') { + $('#file_action_panel').attr('activeAction', 'new-dir'); + $('#file_new_dir_name').val(''); + $('#file_action_panel form').css({"display":"none"}); + $('#file_newfolder_form').css({"display":"block"}) + } else { + $('#file_newfolder_form').css({"display":"none"}) + $('#file_action_panel').attr('activeAction', false); + } + return false; + }); }); function uploadFinished() { @@ -64,6 +93,24 @@ function uploadFinished() { } } +function resetFileActionPanel() { + $('#file_action_panel form').css({"display":"none"}); + $('#file_action_panel').attr('activeAction', false); +} + +function boolOpFinished(data) { + result = eval("("+data.responseText+");"); + if(result.status == 'success'){ + $.ajax({ + url: 'ajax/list.php', + data: "dir="+$('#dir').val(), + complete: refreshContents + }); + } else { + alert(result.data.message); + } +} + function refreshContents(data) { result = eval("("+data.responseText+");"); if(typeof(result.data.breadcrumb) != 'undefined'){ @@ -71,6 +118,7 @@ function refreshContents(data) { } updateFileList(result.data.files); $('#file_upload_button').click(); + resetFileActionPanel(); } function updateBreadcrumb(breadcrumbHtml) { diff --git a/files/templates/index.php b/files/templates/index.php index 28187bcb531..c6dc123cee0 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -5,16 +5,15 @@ href="" title="" class="new-dir">New folderDownloadDelete

-
-
+ " id="max_upload">" id="dir">
-
-
+
 
From 8dcfd0ee8abc72d5446fb9520c52328ba6cb663a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 18:00:10 +0200 Subject: [PATCH 14/15] CSS width bugfix & beautiful radio buttons for installation --- css/styles.css | 32 ++++++++++++++++---------------- js/js.js | 6 ++++++ templates/installation.php | 6 +++--- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/css/styles.css b/css/styles.css index eace46635e9..9d39151641a 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,8 +1,6 @@ * { margin:0; padding:0; border:0; } -body { position:absolute; background:#fefefe url('../img/body_background.jpg') repeat-y left top; line-height:1.6em; font:normal 80% "Lucida Grande", Arial, Verdana, sans-serif; color:#000; } -#header { position:fixed; width:100%; height:5.5em; padding:0.5em 1.5em; background:url('../img/header-a.png') repeat-x left top; } -#plugins { position:fixed; } -#main { margin-top:7em; } +body { background:#fefefe url('../img/body_background.jpg') repeat-y left top; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; } +#header { position:fixed; top:0; z-index:100; width:100%; height:5.5em; padding:0.5em 1.5em; background:url('../img/header-a.png') repeat-x left top; } #body-settings #header { background-image:url('../img/header-settings-a.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; } @@ -24,16 +22,15 @@ 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; } -/* 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 - */ +/* INSTALLATION ------------------------------------------------------------ */ 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; } +#login input[type='text'], #login input[type='password'] { display:block; margin:0 auto .5em; } +#login input[type='radio'] { display:none; } +#login input[type='radio']+label { margin:1em .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; background-color:#fff; } +#login input[type='radio']+label:hover, #login input[type='radio']+label:focus { background-color:#ccc; outline:0; } +.left { display:block; position:relative; top:2.5em; left:-19em; text-align: right; font-weight:bold; } /* LOG IN ------------------------------------------------------------ */ @@ -44,12 +41,15 @@ form a { color:#000; text-decoration:none; } #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; } #login fieldset p { margin:1em 0 0 0; padding:0; text-align:center; } -#login label { font-size:1.2em; color:#fff; } +#login label { font-size:1.2em; } #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'] { width:5em; background-color:#fff; } #login input[type='submit']:hover, #login input[type=submit]:focus { background-color:#ccc; outline:0; } +.prettybutton { 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; background-color:#fff; } +.prettybutton:hover, .prettybutton:focus { background-color:#ccc; outline:0; } + /* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */ #metanav { float:right; position:relative; top:1.5em; right:2.5em; list-style:none; margin:0; padding:0; } #metanav li { display:inline; } @@ -57,8 +57,8 @@ form a { color:#000; text-decoration:none; } #metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; outline:0; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; } #metanav li a img { vertical-align:middle; } -/* PLUGINS MENU ------------------------------------------------------------- */ -#plugins { float:left; width:200px; padding:0; } +/* NAVIGATION ------------------------------------------------------------- */ +#plugins { position:fixed; top:7em; float:left; width:15.7em; padding:0; } #plugins ul { list-style-type:none; border-top:1px solid #ccc; } #plugins a { display:block; padding:0.5em 0.5em 0.5em 3em; background-position:1.5em center; background-repeat:no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; } #plugins a:hover, #plugins a:focus, #plugins a.selected { background-color:#ccc; border-top:1px solid #ccc; border-bottom:1px solid #ccc; color:#000; outline:0; } @@ -69,7 +69,7 @@ form a { color:#000; text-decoration:none; } #plugins .music { background-image:url('../img/music.png'); } /* CONTENT ------------------------------------------------------------------ */ -#content { margin:0 0 0 230px; } +#content { margin:4em 0 0 16em; } table { width:90%; margin:1em 5em 2em 3em; } table tr.mouseOver td { background-color:#eee; } table th, table td { padding:0; border-bottom:1px solid #ddd; text-align:left; font-style:italic; } diff --git a/js/js.js b/js/js.js index 06d4478357c..2fb67f0ec06 100644 --- a/js/js.js +++ b/js/js.js @@ -2,6 +2,8 @@ $(document).ready(function() { //hide the advanced config $('#advanced_options').hide(); $('#use_mysql').hide(); + $('label.sqlite').css('background-color', '#ddd'); + $('label.mysql').css('background-color', '#fff'); // Sets advanced_options link behaviour : $('#advanced_options_link').click(function() { @@ -12,8 +14,12 @@ $(document).ready(function() { $('#mysql').click(function() { $('#use_mysql').slideDown(250); + $('label.sqlite').css('background-color', '#fff'); + $('label.mysql').css('background-color', '#ddd'); }); $('#sqlite').click(function() { $('#use_mysql').slideUp(250); + $('label.sqlite').css('background-color', '#ddd'); + $('label.mysql').css('background-color', '#fff'); }); }); diff --git a/templates/installation.php b/templates/installation.php index cfbe53813e0..73b9a67743f 100644 --- a/templates/installation.php +++ b/templates/installation.php @@ -19,8 +19,8 @@
- - + +
@@ -33,7 +33,7 @@ - +
From 56a3a96e65e665088cde7a23761be790c67a7132 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 17 Apr 2011 18:05:34 +0200 Subject: [PATCH 15/15] pushed content further down --- css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index 9d39151641a..434ea739a08 100644 --- a/css/styles.css +++ b/css/styles.css @@ -69,7 +69,7 @@ form a { color:#000; text-decoration:none; } #plugins .music { background-image:url('../img/music.png'); } /* CONTENT ------------------------------------------------------------------ */ -#content { margin:4em 0 0 16em; } +#content { margin:7em 0 0 16em; } table { width:90%; margin:1em 5em 2em 3em; } table tr.mouseOver td { background-color:#eee; } table th, table td { padding:0; border-bottom:1px solid #ddd; text-align:left; font-style:italic; }