From a538e3369afcce84d351c53ca24484ebcc444326 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Sun, 17 Apr 2011 12:20:28 +0200
Subject: [PATCH] moved help from meta navigation to 'settings' (still need a
good name for it). Also, even more hip new mono icons
---
css/styles.css | 4 ++--
help/appinfo/app.php | 3 ++-
img/layout/back.png | Bin 257 -> 396 bytes
img/layout/help.png | Bin 354 -> 0 bytes
img/layout/logout.png | Bin 446 -> 657 bytes
img/layout/settings.png | Bin 435 -> 695 bytes
templates/layout.admin.php | 7 +++----
templates/layout.user.php | 8 ++------
8 files changed, 9 insertions(+), 13 deletions(-)
delete mode 100644 img/layout/help.png
diff --git a/css/styles.css b/css/styles.css
index 9d0a710adb..93829b7ef9 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -35,10 +35,10 @@ body.login p.info { width:16em; margin:4em auto; padding:1em; background-color:#
#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; }
-/* USER MENU ---------------------------------------------------------------- */
+/* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */
#metanav { float:right; position:relative; top:1.5em; list-style:none; margin:0; padding:0; }
#metanav li { display:inline; }
-#metanav li a { padding:1em; }
+#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 img { vertical-align:middle; }
diff --git a/help/appinfo/app.php b/help/appinfo/app.php
index 661b554f41..c4e9eb5717 100644
--- a/help/appinfo/app.php
+++ b/help/appinfo/app.php
@@ -1,5 +1,6 @@
<?php
-OC_APP::register( array( "id" => "help", "name" => "Help" ));
+OC_APP::register( array( "order" => 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" )));
?>
diff --git a/img/layout/back.png b/img/layout/back.png
index 900ae719adce3a4da03c8cb58d9c637be8eb1540..86abbe0cabe37a4b47f32241b5f327bc346f98ce 100644
GIT binary patch
delta 344
zcmZo<>S3N>TQ9$ofkA#Hqi%ep2Ll5Gdx@v7EBkF0K`v%%yPfad85kHPJzX3_EKYBo
zywU53gFsvQG+ie5tZeSU4be3W+}$GE!n@uptn__zsoSnGLrPv@ZLY#Kvz09lvtpct
zCY^oP=j+G+g{S;@?T5{Wb^f0}V8HPEh(z(et&y6gnLU}?jOx8L^V<?LrUY%-xbyvQ
zcFk1%r7D_FQyBERx8<gH{OITiPo975de2vVozstG7#6(V#k};2t<t&U_EDVa|9uZI
zFnqGvpW1WwCA*5!j7#MW?|;89l&Lp57LeT=m3=Ad@RYEboQmrfYy8qUJxQ$lXwb4%
zTB~0F@@HiDV7S0@(vzEofpfIF7FjDE(Nr=zXIVAxdsByW?k6Rl!`pREhXjhSFdSzn
z*yNUN$=&q8)HnFnQ<1)y>$SID&d9lK*HZhL_3^4pR&uQKH!v_TFnGH9xvX<aXaWG|
CaFzc6
delta 204
zcmeBSZe*HZTQ9wyfkApbW1Q4P83qOh_7YEDSN7X10)kS!htB*kVqjqC^K@|xu{gc;
z@<LuFM*)Y64^^0aofsozd<D367!`DAGqt-+xWLqAR$#)w<|$xvW@3)t-Mk&||NEDv
zt0j3n`>GkR_~bOhgMr@b_8jqbir;uhEMNB53FDYA&u5;>wsB4QG`akThJw<fU#ItM
zJhb-(r)Nr6@kMpDiGpSosr?&;qaH-bWGE-U>1LiQYspi#G2T0As_)^l1&<jR7#KWV
L{an^LB{Ts5x2{l+
diff --git a/img/layout/help.png b/img/layout/help.png
deleted file mode 100644
index bf29c09f8c171eaff20d4fd4983aa1b32f54a027..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 354
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG
za29w(7Bes~?gn8-t2d7yF)%Q&mw5WRvfpMA5R}qOSl#Ksz`*d{)5S5w;`GwVj($vz
z0<QN34sSSmvw+Fwh)mN|&RwO>dxW!X*gBU_uvK*9l<qM$dbU~9C-B=0i$6=m?#6!I
zz3bn5AED_Brr$W-=>9-5f^q!;p&5)v*XMZJsZBD=I=*|!rRzT)1qHp`{5|xr`&|K#
ztlckq78rc%xLkR}ElBTWI@|V>-y3z5+zvF$KZ<2%e8;#h$IwqDW#QzG?E44TE&aRS
z;0w!bKL3i3EZux8{`Wj~F8OMoQe*tGQ*VvX(TPhw<@I<j-MBsRZLCJ8&PQo(<7*;2
z3|qIEEw>DqpZS*K*MS4Bd3G-u?;l|N!KBsgzrd2|3xBDTU?Jl?1_lNOPgg&ebxsLQ
E02e%v5dZ)H
diff --git a/img/layout/logout.png b/img/layout/logout.png
index 0ee7e1b14cd38dd869f46ebefdca8f293c6bb9d6..74dcd33bee7b1bd0d502068f570e300fa0f4d9ce 100644
GIT binary patch
delta 607
zcmdnTJdt&RZ9VUG1_s{ij7}P}D;O9U*h@TpUD<E52y!Zm&t5DU&%nSW=jq}YVsUzI
z@cwKON0EPbBrLx$-I7@%H06j>-;|{3e^?!p1cFXZl?!v*ap;MY)<&Ov*^M2VN4_P9
z2XXvUD44LjdG$NKw6Zeu;_WB@&8akdx5+Yz$!^A@+V{2ht3TI2<1J{-T+6@pTKtFo
zV#f`S7W#xgm2hqE$P>EgtrW$?uvBD9P~;m;!CZlhz1~whGVFXWzxUFV>ObDj@Zh)I
z&wc(31!ZMrOQtBT{c5hX%h-1w@8J*WlT@y}|K7fO_3BcF2|<&lOk!9Nw%XM4dE6uw
zk+z4|x##+*O}-u|61e@gY<-B<)NqD(j17-1o>=&qHUG@o`m4|InQNfS^XJdAcQPcu
zvEX1@b^Y~w#xrRa&*xY?KdLxw_St906*xK!)1I!FV)V&IUu&w@_wMk`I;*oI!<KjG
z>gnnA9)EnL^sXl#mm<^o&yVKLl}*mt_L^Z{Jj1o?`IYmg?^q}O?7_*CCj-1Z>$m0F
z@5(c`c+MT<^{T|`a1H;hx8L&DnjSK!DW2;f;+ntp+KaDMZ)IX4BO{Z0RGm0fTPnWk
zZ+g8;+KJ<=g!i=R)8j>wpSmsn*jc>J^7+c#+wv00{9Nn51aNFTZs~9Nyed2UwQ<9z
zlE&k^ckgard{HB<=i>e1QxcPB+Dq^}diyrwEi=Q_9+O~!4bf}Ej+>la5VTUFxVTvL
zutDDPOe^J<0^iGjw(i_nxnckQ{p=4clw-dczGJFjN?3Sd8OsIM56lNL4S({hvKG7&
U(!B7Cfq{X+)78&qol`;+05)P7T>t<8
delta 395
zcmbQpx{rB+ZN2n*1_tT%jB!#EWf&M3*h@TpUD<E52nb4ROt>s-!oa}j?djqeVsU!v
z<^5Sx0tHw<-2eM6*}R@h*)zmL&{Hu=^9M&|L&J?FA6S{n!uB<WZs26xxY2a#QvZc>
zr%j4b(bCA6()#t*oL27$6>9^7;`eini_f1CS+P|w;cCsNwNvUpEm!%W`)={>ln*TL
zH^yeIjsDT`*i!q(fw_F%5($=7UGq2AyH5Wo9Y3p_S*P?x^NtSx8^;6xq+fL1bBxjN
zk@Nk;7NH~4PyUl|?pf^o<{^9B)7*m@TnbC)Jz@;|^dhSy>-__s=be&Y9jEj46z+a`
z%<B!GX!OG*#q`5=FD4~6ov-ITaF@+tp8?-TgBP>6mF(yguaKzUzVm;#bI!KUMTG_P
z)DOp<m~+Z<-m|>@yf5?_dOooAe_*+O`0)3dw<{ED)fi$pPe|IeERK$tZ`xPeF<bTe
zqW^b0gR*12D-T<iCpJl|zTVST?dz>C{Ab;iPhaI7oxCG*9SqwU7#J8lUHx2G);T3K
F0RZZVwQ2wW
diff --git a/img/layout/settings.png b/img/layout/settings.png
index 8821c353e5d38e23e1f32a29dc0e62369dc0c148..ff650ecb0b0eaa766a055ec8d5f31648539177d6 100644
GIT binary patch
delta 671
zcmdnYyq$G|N<B-llV=DA2M0$DM@k0+0|RG)M`SSr1MhVZW^~e+UBSS>AX(xXQ4*Y=
zR#Ki=l*&+EUaps!mtCBkSdglhUz9%kosAR&1CxoTi(`mIZ|~&u*}{$@$M<jE!O7})
z!6ldHh5dr95d!>{S|Uf-{;*eZKM6Xs^!OuPMe#r(|9Z357?y+Uo+W9_>z=^UwX<be
ziyC9OYNGgN`$?R}=bLx$I41V%0k`p<^U3$hpYe8Zq<eBq6m*)f{!HbZru_>&G`Bzh
z{8Nh|)j-0Ab3xqt?R*Y1&p%%sbShUN<hgTC@xIfR%U_mc6`re}QydkLZ#H}8zpCjS
z5`v9_f($x0xBWG)7wU{T#@bYz=dU(d`t<43>zEjNHb!oYxHCP-$%|95WzF^1?KgAE
z^k<)aclGsGXT=ttPpwW5gOw%<BywBW+Sb0`rMGjP_s^O-`2$uB)(m;f6?4u%w`cn~
zdGcg_M_HNUCvR-?ZT$83AIE`Pk8+uJ+<yPvJ@H!MoSsWBOWw5~yqHm+A`qB-(Oj@r
zzW;dDjNI+FvriRRY+=q1@;Z{VG5dLJoQ>RmsWkTHMrH<WhO(@!QHM=@KW*KaanR)K
zS%vu3SEU%r7;N^qxVSU)oqD>-%Z2|>+5O0ArThod|9?miI;DF|f?>h!w{@zErZfCI
zbFjc7rps-yy@>11qKTFQPJbTFslV@|HhCTs!_JsK^Vw&Um71Pc&P$EFwutrgCY|%2
zZIql=U$ydE8uaD7jLYJS%a;bdOh`_Cymi&8=vm85c@8TaHt@K-rES$J{Yx*utPWaP
zBGBnFkNvLxzOTv*+Zi@wZT;nTz4TJ)T&=06q8WG&lrpSbVDU%%ANR2vTn$_H|8;V?
eFLCZs9kY^?2>(ot^d}4q3=E#GelF{r5}E)YOD%r@
delta 388
zcmdnax|w-`3O`$tx4R3&e-K=-clqRrh7$GcC7!;n?6+A21f_))Z+sD8U|@9cba4!^
zI6Zf=p*ORmNXvdv(V(RQ+5f${tm_>QBs^3+BpR+_=^@OLyDmUEVu`olY;D!9ZERoF
zJ6bh1a^7MWmFa$?Ce3^B^np#=^Y5S8d$X2X>}!>5g8>iYgpf%l8<P3?uVzi<ypm<=
zeygnB(37{f@ZnK&#;CQ|3?`^_-rlkGWUOcH-=hve$Lsbp94WL3x*J#~!zjSgD7^E$
z!#hToz?P4D_A+ai{bbwHSiJilL)U>-r_GN^xa)XX{rlSP>}lzFtZz>5&kXNdu9uEa
z5#pY7=4o)}>gT#^JQ8P3cTHPxd-p@>!@q9zsCfRKv@YxUh644MSL~1YC%oL>&Y>fn
zyzh^fmE^jQj0<A)`fnHaxmiir^1S|h)$}CKrN!5;{q$ODv}VE09IJ_K=`YVHm#OOB
us8G_JzwG6cTnkfkZ!X)$$(fc6_OiY)?C!^Am@+UhFnGH9xvX<aXaWE}uBe;<
diff --git a/templates/layout.admin.php b/templates/layout.admin.php
index e20b7e48ec..9f5a175605 100644
--- a/templates/layout.admin.php
+++ b/templates/layout.admin.php
@@ -17,10 +17,9 @@
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
<ul id="metanav">
- <li><a href="<?php echo link_to('', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('help', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/help.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('', 'index.php?logout=true'); ?>" title=""><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('', 'index.php'); ?>" title="Back"><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title="Settings"><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('', 'index.php?logout=true'); ?>" title="Log out"><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a></li>
</ul>
</div>
diff --git a/templates/layout.user.php b/templates/layout.user.php
index 1ab2d01d9d..b03fca9308 100644
--- a/templates/layout.user.php
+++ b/templates/layout.user.php
@@ -17,12 +17,8 @@
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
<ul id="metanav">
- <?php if( OC_APP::getActiveNavigationEntry() == "help" ): ?>
- <li><a href="<?php echo link_to('', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/back.png'); ?>"></a></li>
- <?php endif; ?>
- <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('help', 'index.php'); ?>" title=""><img src="<?php echo image_path('', 'layout/help.png'); ?>"></a></li>
- <li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title=""><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('settings', 'index.php'); ?>" title="Settings"><img src="<?php echo image_path('', 'layout/settings.png'); ?>"></a></li>
+ <li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="Log out"><img src="<?php echo image_path('', 'layout/logout.png'); ?>"></a></li>
</ul>
</div>
--
GitLab