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
zcmV-e0jK_f0*nKYJ%1mm001AU0WDuyNB{r;2XskIMF-mi5efr4KDqBl0003QNkl<Z
zILoz@u}Z{15Qb-#EdobsYYS1ZTYLZuixjq3itiw)P3+Q(K7nW&A0Vx5Al5digg}~H
zLK2eA?v71P5A+Oo$9?d#!z};Lz%T&&#29nFwOJ{3X^d&MGJi`cZ-!xLlv1>@x$pZ2
zDP=FEBq`-&04|HRZD)x1h=^BXpT^gW^)D>T;v4{=>$(G_)IB23$3I#LXa7yW008nl
zzh#Wg=?5etn9_HE@B8m@9Dg##P-~4^YtmZ7lvbGuA+Dn+`Y6ki7K_DFrm8Bc>-tXt
z0Pr!ONs{E*aZ#KqilRFq#3>>&&N+IX_kxHUZSo=v!?!HUR8bTJ0LK7uvPNq;3xeP^
qO;g(C6pmciecI`mY}-DBee(t5s?s_h1)s100000<MNUMnLSTaDaFzc6

delta 204
zcmV;-05kuL1AzjNJ%1ao000}W0bUxB8~^|S2XskIMF-mi5D^*;!p!(G0001vNkl<Z
zILo!up$!5-5J1u4BmzxB0azSO5DK_5aEL1cheVLj0){qlGyn!k5IoG0Y);*7xbOc@
zc4sDHNapn^P@~C~F~LzwuDrxeLSM1M7H=K;$TM8@=b6fDJVj*klXv(iAR?mr%e=9|
zz32%^WQudqCnk{*Hh5)^u@hS0S{!I2W9*9qogFz0cClYeVwFw9cA(<`0000<MNUMn
GLSTZou27Ev

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!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=E9BL736%&ErQvLG}_)Usv|qECPa3dI_sL9e_gbJzX3_EKV<-?C8hjDByZu;P8f{
zHw&0-j>t4k<=j>3yhk|OhOKk?1Y1QnPU#+Fqi35neFDGDu=uk?>~8GW-Mjw1_Ys=D
zVET>IjqVR5BN*2o5SqbwbbXGeo!TU`tmC_vT)O__QBcs^&EG>0yWbV?$lCp)XMw@D
zj?0xt+=BF8rn7B7`Mps`$?ZV1{G(WQ#&?YCat!@cQWj3`$i9DY-O|7N4Zg74=JT)k
z$kNTn;(yO$=aR4XDK*9~JN4EG9i6!3Q(lkf(v8~_-^OZm>U@;uHohjZ!?1Om*>cN(
w`I&DyejPaAnrHWt@%{nEA52=^{tGObzVMei2^KQW1A3jo)78&qol`;+02e%v5dZ)H

diff --git a/img/layout/logout.png b/img/layout/logout.png
index 0ee7e1b14cd38dd869f46ebefdca8f293c6bb9d6..74dcd33bee7b1bd0d502068f570e300fa0f4d9ce 100644
GIT binary patch
delta 607
zcmV-l0-*iA1Ca%gJ%0_?000fw0YWI7cmMzZ2XskIMF-mi5eXv~o1+<D0006WNkl<Z
zILn<=ziSjh6#m>8IrIYB9HbJI#6pggVwd~{L1GY6$(0^fM!3S{LMpLLZym9SDa7_*
z7g7lRAaIbogRAZiW_ETrbGOO<oOw3xvN>V`KA7Tt?|t8U^MB?IaD{2D54F}`@V^$v
zF~xCASLGN*hlp+x(Muv)0sy5Hlu}vjDG_ZD(Tz)$h-f}d)9*?t8jr_^0O0#R`Mys8
zaCUZfq?979^*18AGfkci!|-R4B-HQshpVfrbpVi3l9ZAFpjN9jIp<!IBov0>*9)CY
zCX?4u6j8U^9e-3Rl~(}n0f6H;<Ty??gZXN;`i?Q?MNvfO=jUs=0AuVp2m-3t>+b=~
zW;o}ZIOoM7mYdDy#~=uZF=pkclrr)>FDjKv_lsAvEURl-R;P$9E-o&O$K%v>-AN7#
zAp+0y;+>rxV`{eR0G?j}*4J-&o|m|;8|L82$;nVkNq@F&Ke}!=IOhveO6qhv!+a0g
z?e=f2HNr4_bDcmGMQ^p%==FN-99&shS!0YPLI@><c=j){>$)342+bHvmY0`b6l3K^
zqw$Gzt~uwaZQCChV-E_i^iT+~$2m_q=Xz^v>ob7zbb-gaySs;@(I{q&(cg2*7?YVl
z7!2a=?O5#t0M(2%QxLFQtyaf0&7e}L7;|%TCBraor)fGPgm6vM{I$8cd9c5~zX#wr
tBVG0}?gDrMV4={a1keTW1Hfr9`41%paOx5%(E0!X002ovPDHLkV1hPc8C?JX

delta 395
zcmV;60d)S61-=82J%1ao000}W0bUxB8~^|S2XskIMF-mi5D^<FkkcJB0003?Nkl<Z
zILnpOziO0G5C!nx{q|!we+nZ>R7ep?AzCT;2zh{j*rf0U0(MrufmN^x0kN?)m8DOi
zotBbVBq}Iql!f)$oP|qRBs(xLbMKuqbI;5asI@L&)qL`;lz;N4B={}vqq}7A1n;q3
zYOP!Nh~qgc*ub3*OBi4|dWxU1e?^z^8(*4t11xpugSd!K*vC=)XVFEx#sN;^L*HS9
z62zCu{uo1yqeJZB2VUiE!DtE~rJmveR`Td-bZYP54Cjd%^+A^ojB&f^#!BoC6<gtA
zA!oxr=#pWA&wmZT-3CCuFb?rB=$p25xQQ2d7=O39|BFLxw)1jvaGoc_UdWuvIiBWj
zzYXXw0F3YkkMIQ7!^8J{?WiGrCIDOs$QeF_qgz;?HI99Vn<dwx|J{jFYh6ou!#Q_h
pf*U34yoP&COD_}ru9WiiA3;J(SZzQthX4Qo07*qoL<FuvV1nw1wQ2wW

diff --git a/img/layout/settings.png b/img/layout/settings.png
index 8821c353e5d38e23e1f32a29dc0e62369dc0c148..ff650ecb0b0eaa766a055ec8d5f31648539177d6 100644
GIT binary patch
delta 671
zcmV;Q0$}~K1Gfc`B!2{RLP=Bz2nYy#2xN!=000SaNLh0L01ejw01ejxLMWSf0000P
zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$SG)Y83R5*=|lh11tK@`Wo
zv$zQbLC{2P4Cp_gwO9}jIVu#y2K)zl3*=JFrN`neAs0~+Pk%OrTm-?c=3*$Gi;x70
zxrC;KCINRPVHdMMk_j`<gS)uK7W&`|GrZ4Z-go8=hzMs%2$2y&kgv>noPxihNGZ4H
z^Z6<OWiS{#37}rDw+=v=&*!UB%55N2=R=HhzRNkM>2zvw&U>75T2OB`o0<N4mxve<
zfe{e^EZMgGGk+3^T*d{0b8b&2lN-y+%dP?djImj<SlpLVLP`lCgsj)=huLg)FPqKo
z)$8>`A%qO_g+k#|B9Rbb3phPJeeb$1xvoq3e10FmI)FO>ZUcCn&*wh|`ID2A4?!Iq
z$H~~XO@aFT{s_R@;%x)C+wb>BVb*b+jMC|J?uWtAXn$l7QDf0J5q%$z$9kA;x7%yV
za5%IBZ&FIcVzF!IU0ysMzZzx-gMkA8D*$$CwOYe8P4cz5Xu&ki%^+W^)fxbH06e@z
zL`MLQ%H^_3L=XIS-&vM*55Q;t@MluWEyfrCpxf<!C8C!A{>;H}I9!TGqdycyxpI*?
z5JLRooPXa;CX=250J&U_H=E64B7*06o@H6qq6N#cEYI^iB0{UxI!>ih^v@hbqtU0O
zQt4o0W8<}|s#}_-H4MWb!!StGw1%pxFVgAst5T_S5Q#*d2i-5e^&<ec0I+Jc`bO7v
z(si9GmC9QH48U~&sh~Lg7yb*z*b0EOzx_f)-x$u~egh&x6c3pwXXF3?002ovPDHLk
FV1gh^Eq?$2

delta 388
zcmV-~0ek+p1+xQ?Bo78+OGiWi{{a60|De66laVnPe+P6)O+^RW1P~D$6Cv325C8xH
zKuJVFR5;6>lQByJK@^0)6%|sY5NrQS3Oj#6z+mAa!WCB}IY<)(ZLUxwSfoo4n=2)X
zwg&Ylh=nMz3EBr09E<EG8x6tBz_Pb*-^{()eG3-#dL4i;3;~c-k~FYm4-eI9l?l{p
zHAmWZe=$i7jd9_{Hvw9$)-aGHiQBlf$z4f({l!31$9}&6#Bn@Q-BETN0T2X%6S>bo
z?g2zmgz>z+11om<2DE{5yWRkbz^cnP#u!H|N;>}aheJs@Nyd(xjrnLx+C|dGloAV)
z%;i&wtLH7ONMV|nMP{JeyWtzd`r3>nN&AwnYUi+UC+XBb#7|)9zlR7c8)LrwN;(;?
z@d2P*E|1%Djz&5dJq+vf)iucs(xcbb`AVfStf1L!I+2EF>C7W`B`w%^A}ODy>EvxV
iH8)ENJ%N*HIRHN$O<V^@#+Wq#0000<MNUMnLSTYEuBe;<

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>