From f7f957abb92e5ce359d7eafa136406822fee0a51 Mon Sep 17 00:00:00 2001 From: Jakob Sack Date: Thu, 3 Mar 2011 23:08:11 +0100 Subject: [PATCH] Base for a more flexible navigation --- admin/appinfo/app.php | 10 +++++----- admin/img/navicon.png | Bin 0 -> 874 bytes admin/index.php | 2 +- admin/templates/index.php | 2 +- files/appinfo/app.php | 7 ++++--- files/img/navicon.png | Bin 0 -> 635 bytes img/actions/arrow-down.png | Bin 0 -> 525 bytes img/actions/arrow-left.png | Bin 0 -> 512 bytes img/actions/arrow-right.png | Bin 0 -> 527 bytes img/actions/arrow-up.png | Bin 0 -> 484 bytes lib/app.php | 12 +++++++----- lib/base.php | 10 +++++----- log/appinfo/app.php | 4 ++-- settings/appinfo/app.php | 2 +- templates/layout.admin.php | 7 +++---- templates/layout.user.php | 4 ++-- 16 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 admin/img/navicon.png create mode 100644 files/img/navicon.png create mode 100644 img/actions/arrow-down.png create mode 100644 img/actions/arrow-left.png create mode 100644 img/actions/arrow-right.png create mode 100644 img/actions/arrow-up.png diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php index befe8e678f0..3221e276c5f 100644 --- a/admin/appinfo/app.php +++ b/admin/appinfo/app.php @@ -1,12 +1,12 @@ "admin", "name" => "Administration" )); +OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" )); if( OC_USER::ingroup( $_SESSION['username'], 'admin' )) { - OC_UTIL::addNavigationEntry( array( "app" => "admin", "file" => "index.php", "name" => "Administration" )); + OC_UTIL::addNavigationEntry( array( "id" => "admin_index", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "index.php" ), "icon" => OC_HELPER::imagePath( "admin", "navicon.png" ), "name" => "Administration" )); } -OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "system.php", "name" => "System Settings" )); -OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "users.php", "name" => "Users" )); -OC_UTIL::addAdminPage( array( "app" => "admin", "file" => "plugins.php", "name" => "Plugins" )); +OC_UTIL::addAdminPage( array( "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings" )); +OC_UTIL::addAdminPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users" )); +OC_UTIL::addAdminPage( array( "order" => 3, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins" )); ?> diff --git a/admin/img/navicon.png b/admin/img/navicon.png new file mode 100644 index 0000000000000000000000000000000000000000..f2c7c0867f657da1209816b3c410d61c2d1df9a1 GIT binary patch literal 874 zcmV-w1C{)VP)6SW2UXoB(ijskm7m_3- zVjoJPw2LC?L{tLtOAZvAmZG?6(U*aR&N;8I>$W-Bmiv&Xx#l*yd@$Wb+iY!fZ?DE+ zh*&>(Zs$Db|D40~Jb+;sJZ^1`+8h7XL?Y3($;ru4m0DHkvjK{t-Bzm=8FIo}Lp~nVF}RN+sC0ZD6%o;iuhBd@q;JEG;dq z@0Z{Yo(bXhopLFc%gr|#4fRf^vvtj|7UXezc5OD>j$_C1L#NY;X3^PZ3?~2%fZM#d zNHH@$PI|exm_H_w0EtBMh{a-#Mxznq{$22c0EfWi@iGz;n1usE0pu4HLQ#g<+>o<) z))#!FKzn<8UJN}(JuoOFhJ}S=#L*|kpg@^|4Mjxm`o@T5E4%% zgVAX0Q7g1Vs;ONMIn9e)yh~mf;RcAn55Jezb)$pd;myv;!tguCDk>^o`Fzn45HIfx zbh^HCv!FAsu-_4j&G~;@t zQy9F?tu4sEMN8Gb1O2)T2}Dp7C7VnpxmvAOkjdoxp`oEG&CShexVj4tP+ovM;NBxV zjR+ -
  • ">
    • +
  • ">
    • diff --git a/files/appinfo/app.php b/files/appinfo/app.php index aa0054fc43d..8b1a806b7be 100644 --- a/files/appinfo/app.php +++ b/files/appinfo/app.php @@ -1,7 +1,8 @@ "files", "name" => "Files" )); -OC_UTIL::addNavigationEntry( array( "app" => "files", "file" => "index.php", "name" => "Files" )); -OC_UTIL::addAdminPage( array( "app" => "files", "file" => "admin.php", "name" => "Files" )); +OC_APP::register( array( "order" => 2, "id" => "files", "name" => "Files" )); + +OC_UTIL::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "navicon.png" ), "name" => "Files" )); +OC_UTIL::addAdminPage( array( "order" => 1, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files" )); ?> diff --git a/files/img/navicon.png b/files/img/navicon.png new file mode 100644 index 0000000000000000000000000000000000000000..9ee717c8b124c186edfd629c70d83ebc3dfc6b4e GIT binary patch literal 635 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~*<;sHJ( zuK)l4PfAbIH!(A^ur#%@Hn+92u(P+cwX=3`aCCKX_ww-e^YQWb@d*s{3-I+1@(&0N z1+w*x4D<{Pl2TKWQd1L>k`j`W(lRmp{}_Vo7i2AT{sFeo%IG}t#*k0BwGA)%B3Xe7|6w9K?DE1vv<)M879;%J7F;=Gd5 z%!-Pfnwo-!hT_IFu9lXvj;_|uo~|xuhTh)pIYGP&7S3G~z_2!iVOQJbd`*@#Ck@o;`o@ z`pw(VU%veQ^9L9vOH|^o0K-wbB*-tAp`rm5^j)~}^XIQ$fByb`P`a@KsBFEbi(^Q| zt<;|Dd`$rYF6;M}zuBvu9_+>u2KDjwcG z>uT>9#rA3W?4o~P+fJClr!T8}$ zJCS$qI^o{LM uTFAdLcI_93TAP57bSXBm$5B#$KQr0RRZpyT(^LaGox#)9&t;ucLK6VI&jeEd literal 0 HcmV?d00001 diff --git a/img/actions/arrow-down.png b/img/actions/arrow-down.png new file mode 100644 index 0000000000000000000000000000000000000000..03f201428ade2247beda4510d7d026239ce76e95 GIT binary patch literal 525 zcmV+o0`mQdP)9=F*v&h)z;9gN*xgu->v1X*39s!zo=YGCdZI$o{A0eS z3zwhoU88+%XSRQB@3F;HT_~_lg{` zH*{|g3fzPm2EqFieQI+mpEMh-aV}Hi4(`1L@lj0Tg|E1le8E3>2FG*_kR-#~ZFC9I P00000NkvXXu0mjfgP`0> literal 0 HcmV?d00001 diff --git a/img/actions/arrow-left.png b/img/actions/arrow-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b56cfee03dfefe9ff8f2c5e7e2a8a0bb0b15ba6e GIT binary patch literal 512 zcmV+b0{{JqP)qm|rIM*THKYbgj#5EThHVGp>QQ+y$SGVUd5n>Vi^Dhi? z=Gp7p`&O_%-wyUezg*(nRzm^8q$r;Q0FLwje&-*R0-@+#lQ?Ps0000pf9L*rlU&o38m%ZUnjts@YN3Td9RC#dB77qOajaU&u6O)=K#zfzH-=kSAiP1c8rUMV0-#Lev z8NDFz0Gg#tWInR=YylWcD~l^XV;^H%^n>Whf)-}LP;Mc&JbXC(o2IG%X@Uq)yez_n zoyg8+-z1WWKa`0RBbh$8C34Rcj#RA+eYcCV{7O06WHTD-0gS$h;5 zR8G#OIM3y-4@oE?$NnX7{r7hFyjq^%RW73g|9zv%hvq;uXumZ#(FHxf^BsRnl`~7B R;>7>}002ovPDHLkV1m8G+5Z3l literal 0 HcmV?d00001 diff --git a/img/actions/arrow-up.png b/img/actions/arrow-up.png new file mode 100644 index 0000000000000000000000000000000000000000..5e423213fbd735f153563b7655bda918cafc868a GIT binary patch literal 484 zcmV2#k(t%MMgP62BupmrE z3A4dqMLPHf#CH&45wS=UU%*E&Nb1j`L7Vrz_qruaRK+5GPtJ6bUrtWWVGsoP4F-Te zEZ`Cs^P6KUXv3E~-~z{n;@JyNc)Sj3~hw%vQoHD)>z zaEo*@&S`#lG^Qh(Op)rTX<4pw-s*iTFfYyB;&?Gni$e7%FiA9{O=(ExBD4?M3OL8* z>51tTC+-MsYWTJf?P?$e)T0m5PFk~KvwP!H0cTh!7K(eh;hfOaP*TC`_TcyVKmtG- zxOHp7cfATLX8A+#zO=$f;jA=SGL^5;iZ()tsQ?E+tR;9WGi!)+B7Mjm_9H~1g@yG@ zG83;}RPh+5F6(H>2A;c~5fQx*PXfY_kWxYfg0ZM;-#6~I0j$2>0Yfm49{hwOG=h+S a@JuhD6KyhT2soDj0000 "index.php?logout=1", "name" => "Logout" )); +OC_UTIL::addPersonalMenuEntry( array( "order" => 1000, "href" => OC_HELPER::linkTo( "", "index.php?logout=1" ), "name" => "Logout" )); OC_UTIL::addScript( "jquery-1.5.min" ); OC_UTIL::addScript( "jquery-ui-1.8.10.custom.min" ); OC_UTIL::addScript( "js" ); OC_UTIL::addStyle( "jquery-ui-1.8.10.custom" ); OC_UTIL::addStyle( "styles" ); -// Require all appinfo.php -OC_APP::init(); +// Load Apps +OC_APP::loadApps(); // check if the server is correctly configured for ownCloud OC_UTIL::checkserver(); @@ -239,7 +239,7 @@ class OC_UTIL { * * @param array $entry */ - public static function addAdminPage( $entry){ + public static function addAdminPage( $entry ){ OC_UTIL::$adminpages[] = $entry; } diff --git a/log/appinfo/app.php b/log/appinfo/app.php index 292d59ee578..e639982a89c 100644 --- a/log/appinfo/app.php +++ b/log/appinfo/app.php @@ -1,6 +1,6 @@ "log", "name" => "Log" )); -OC_UTIL::addNavigationEntry( array( "app" => "log", "file" => "index.php", "name" => "Log" )); +OC_APP::register( array( "order" => 1, "id" => "log", "name" => "Log" )); +OC_UTIL::addPersonalMenuEntry( array( "order" => 2, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log" )); ?> diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php index 0db99441574..c43d47f0dd6 100644 --- a/settings/appinfo/app.php +++ b/settings/appinfo/app.php @@ -1,6 +1,6 @@ "settings", "name" => "Settings" )); -OC_UTIL::addNavigationEntry( array( "app" => "settings", "file" => "index.php", "name" => "Settings" )); +OC_UTIL::addPersonalMenuEntry( array( "order" => 1, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Settings" )); ?> diff --git a/templates/layout.admin.php b/templates/layout.admin.php index b4fcc915882..849ed6656be 100644 --- a/templates/layout.admin.php +++ b/templates/layout.admin.php @@ -25,7 +25,7 @@ Username @@ -34,9 +34,8 @@
    diff --git a/templates/layout.user.php b/templates/layout.user.php index 0643c99e933..ff845a9b957 100644 --- a/templates/layout.user.php +++ b/templates/layout.user.php @@ -25,7 +25,7 @@ Username
    @@ -35,7 +35,7 @@ -- 2.39.5