From 1fc9e1f75d482f372079be515671dcfd0b4046ef Mon Sep 17 00:00:00 2001
From: Uwe Kamper <me@uwekamper.de>
Date: Fri, 25 Oct 2013 20:18:28 +0200
Subject: [PATCH] logo and username in menu

---
 cbmi/templates/base.html          |  26 +++++++++++++++-----------
 static/img/c-base_raumstation.gif | Bin 0 -> 1326 bytes
 static/img/logo.gif               | Bin 0 -> 564 bytes
 static/img/logo.xcf               | Bin 0 -> 2274 bytes
 4 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 static/img/c-base_raumstation.gif
 create mode 100644 static/img/logo.gif
 create mode 100644 static/img/logo.xcf

diff --git a/cbmi/templates/base.html b/cbmi/templates/base.html
index 249ab09..32af654 100644
--- a/cbmi/templates/base.html
+++ b/cbmi/templates/base.html
@@ -29,6 +29,9 @@
         .formRequired {
             margin-top: 0px;
         }
+        a.brandtext {
+            margin-top: 10px;
+        }
     </style>
     <!-- link rel="shortcut icon" href="{{ STATIC_URL }}ico/favicon.ico" -->
     <!-- link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
@@ -45,24 +48,25 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </a>
-            <span class="brand"><a href="/"><img src="http://c-base.org/cv6/images/c-base_raumstation.gif" />
-                {% trans "Member Interface" %}</a></span>
+            <span class="brand"><a href="/"><img style="margin-top: -10px;"
+                src="{{ STATIC_URL }}img/logo.gif" /></a>
+                <a href="/">{% trans "member interface" %}</a>
+            </span>
             <div class="nav-collapse collapse">
-                <p class="navbar-text pull-left">
-
-                    {% if request.user.is_authenticated %}
-                    {% endif %}
-                </p>
-
-                <div class="pull-right">
-                    <ul class="nav">
+                <ul class="nav nav-collapse collapse pull-right">
                         {% if request.user.is_authenticated %}
-
                             <li><a href="/account/logout/">Logout</a></li>
                         {% else %}
                             <li><a href="/account/login/">Login</a></li>
                         {% endif %}
                     </ul>
+                {% if request.user.is_authenticated %}
+                    <p class="navbar-text pull-right">
+                        <i class="icon icon-user icon-white"></i>
+                        {{ user.username }}
+                    </p>
+                {% endif %}
+
                 </div>
             </div>
             <!--/.nav-collapse -->
diff --git a/static/img/c-base_raumstation.gif b/static/img/c-base_raumstation.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dc80bf874f872d6e650a576f87b47b7caf5b5e8c
GIT binary patch
literal 1326
zcmV+}1=0FPNk%w1VMhTV0K^^uQ92m^nE)mm3l<LsJ1Y{qZ~%8l07NMO3kU;DHWo%Q
z6=ppE1q1>h7YZ{U0Pc?f5efh{ClDeO0GV6>-Gu-#BM!`Z06{Jj8xsgsGXN_e4Tw?z
z5DW#XW&i*H00000A^8LW0015UEC2ui07n5J06+!*peK%GX`aX7oNVj9a4gSsZQppV
z?|hF3fr4*HEE<o<q|yhp#1@69w6GZgg(k>VWB_JP8{k3I<cd$-z!&leio${Ma!#+?
z?=ndW!qXr4Fex(*a)E^>2m*?WiVP$S4FV00BZ>_p1BwG4iHZm#42z$fjEf$nq9dIc
zB&eQ|0wSG^lOmY{qp&BIn3^7;lCqk&rI)je2*-?+B+99zsL8GZj<=&Ex*pad*+W}+
z;Njxq<Vz41KtKjRZXyNg?Ia8E@DD2_=kV(-^YlRW<pK&E81BHoLunoW3UrV}!iDbw
zOfZq=(20HuM?{=Ru%pM1AVb<1002OQ1SKQ?V4xJCqyhp8Qi>=^pi;?LG)V%`P;vl)
zlCoe4hzS7GO;AKH5I_kamaU^Aeiqf~)I-Ul0(w>e@DivAnl_tS1wa5n$*p3edeug=
z6at+mQ?4|jlfa^w3D}Z#3zw-%M_B=EDk1fhR<4DKd=tsIvE#?y;z6EFxpFuO3k+DC
zu{iUBg)9yj7=5n=X3a4~leWydwVi$zK;KwA!a<t=5=Kw}vY^BSARIlwmVIJ(fZim2
zOLWb=xsNs!PDuEch8`9V(4_<EVCFcQGbS=Tppe_a_U_2v?Q_n)y$<F6kk5e7!5?oE
zw&Bf)c)vvcbnXQx;DAR^HNpjJ1%_7tRbYt_7)}5%#YzJuF{PIVEEq^aO9`|D00$&!
z=s{s3US(K>WR18M2@ReIAyWg0n3!Hw8I_g?2o_a>j6jKKV^ukxI2Z|q1%^^hGZH9+
zfec7R4PMMJ0Oe3uRak)|VCf{7ic?kTQdJsq(4q%orby!miB-VVRSH}Z*d`6c)aEWk
zU6sI<W7WifhY>I{BLixBDHxMZ(j{nw7y`QHRWTmbq@!_p$)%7U#L3kqib<yArkn~$
zTc@Cg+S;e0mTD?vq@JqkssW|S>Z`EA00DgK)vy?UwUUs5ap@FL8a}kXu&Z^y#%ioM
z=mhY9X1UE44<T>_P{jxt^qRr{0Sg%SK(itw`@jYVa2uYr*m^7OvFOqf(PlQJn#Mi`
zY3cz4#%Tn^Jr0~ZLcCZ&AP2ob5SQ-2Mz~6yeb*V>PDS6v;SLq<s6)oWXT%$T2vGP+
z@Wx2g=bdj7$KbJiBPh3zc>y><5qK_`ECR|Zb1ZWm@D(r`uO!1z^Udjy{2v9Q?K_&j
z7#oo6$1mRobgnZuT|~C<6u|Biyaq9~1n}**-PKt;?e*6%Xz8T_L|#?X2rWM7!J1@?
zP-k9c3ObgcgE6osgNOPA6atH06~T!;P5PCYF0O4hje&Vt)}ezk-gbzL=VeyjVpmD_
zn<f-l<t9n8s*?s05Fpj71tQp;B7zBwlJ-$F{Zvy-qVL_e0$@V*R8xEdK>Ckp_Gr6_
zfl(+}=Q9zmHceX*z@v_O(fxVoqZ@i?ER{3*eC)bYN*GYV_e8v^RB?b8D;{8w(jp$R
z@}(kDT>_R=DHf&-QM`-5(@u+^KFacXU9gBtLYiEKPOv@!v@cH{K#T2WR2RP7M0^n<
k-;Ua%2>LY;8Q~kBgU(WlNxeyc5dvEe-f|5Q1}FpoI}G+MmjD0&

literal 0
HcmV?d00001

diff --git a/static/img/logo.gif b/static/img/logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f17304da1d225a1fe4ec0b5425aae763ac660ef9
GIT binary patch
literal 564
zcmV-40?YkJNk%w1VO;<k0E8X@Q92m^nE)mm3l<LsJ1Y{qZ~%8l07NMO3kU;DHWo%Q
z6=ppE1q1>h7YZ{U0Pc?f5efh{ClDeO0GV6>-Gu-#BM!`Z06{Jj8xsgsGXN_e4Tw?z
z5DW#XW&r>H|NsC0A^8LW3IHDfEC2ui09^nY000I4;3tk`X`aX7oNVj9a4efaP|SF)
z?`3`Sz@TvC8yb(ZB67*>*_u$MGD;Ort61GN%Z+WjLdn8#;7!L1$m?KeuUuksjO}JY
zCbfXU{1g@PdnXwbc|LC?cYrU0g*JyG5Eg}jT74gXc|Rlzjd>4`ACZ$ToSgxmB$B6O
z5`3Bt2OD`CBpI0*2MdI!ts|-r8wb6Dx4FN)r50*IUk(p7!@CP5cmWe5$;&R%)HT<a
zHDy+oBnCBs2VW4oBbaXv!zJl`5aR1KYBd%y3kClF1!#%*5=x1=02xlm3Ls9Oh=bxv
z983t|*^h-~2!1eVN|Q#83{ODx6VT7Ofqk+@&I=%-Ux5|RD4dW0vXQ2kGi!8sSYw)r
zktQ-cpwP;JPM!gL{-H#oLr)Xcn7VM96za(jMg#2o84gBN5m~ponD-#!hl3Bat*KGA
z99wOezPSxa>TNr3UNg1XRdq%+8+-Hk1p6!ig*GGT#M@**RbRq24omH3YOo9lR6ALQ
zoM#56rzM;fdZDXO0kb$tXF@$f!e7riS&MMp8HR)uYI)o~kefw{8L(vh216W32mm`z
CgxVkg

literal 0
HcmV?d00001

diff --git a/static/img/logo.xcf b/static/img/logo.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..df40600d7509566961ea5d7c80ae540e2a7d689a
GIT binary patch
literal 2274
zcmbVNO>ZMb5bd6s?sjJEnaS9hU`%SQ-3St`5+$s(2Nn(>1c&7U5;s2Ncx|txB#z=N
z>~i6R#0{?d7dUa}4{+ej34Q=VidH~S<cU4JnvcZU1PL)xsjI82s;jHsvj@YygZATY
zzx~<P*0#X+G2}&v1(A?XAoTugFQiY!%PlVs^u62B4+rA&cg5T5!mHTt-HqRQb*cY`
zP>$7JcJJH}$KQxWSKNIiyx9;>KN7!wCAM$*KYbzI+^o0il@ITT+c#=oe;~rD`mT@U
zVi6+wsyd|d*0(~i;A=n}2$vEUI{Pib|0S&90L5<%_d0{##^7-H046S3ina04ligl>
zJlY*TSa;X@gYIZ|bl6_YmW{)~PN%)Kxs`p_DBH!+Izo4@2`$gt|E_T8<MBbKJKP_%
zx68X=d~%(!ux&irA0D-b``w4VF~^Vk{c-Q;yg-h=YRWB_L%9#dCx0t7tmSAG^yTix
zPG{Wv^sw`2Z+z4_8jkii2g7V0+;09fgxjA&DuvGNUnq1eg2%u<{JD@)_vZBKoL-yL
z1L&N${0x*betz`Dx%GXal+Qq&){jW>^JTmB3ras`TZ^Qb`E-w@oT>l4+@d7%w4o?Z
zBPsE;7t#XFjFuYtU7Ch<i97U#&rIb8P19yW+H$IVQj~-g#?pG;69z>N%{-~)H1Nr$
zlQ5=O%0QdwBIlWJTAZ~-7R{Q_{#H%nHQ*M(avDod$~dH@yiSKEejp{PrUX77vL>jq
zj{PYdQJ<kWcU5$vrPM?Qb`+9?2!J0Rfzo2~P?}N-7sJZ6A|PZ}LRb^KKT($<oS|k#
z8cLEKDt0bn*m|0W7!E-wLX>I+vVr|+R3t27&T{h!%q!VF9-NXa2oG7|2cb|rNK^HE
zf0FIVM<H|G6Fe(0Xwd}WK?winEoc$?QRj@=4VVQFG*Mck6LRK}f5n21bAKBe52M6r
z9pOrZX?70)iIrS+XbL||`ZUF?EFgiQbfE(w5nmPpX2yh=Nxpgj?|o_sD}DVx$f~f@
zI{YlGu5eOMsABJ=MpRNQrm09vn@W{%Q%A^jc45@1EvgWm#z>@)gp)ZC3$|t0G;|43
znN6itB(~=4`MJV{7X0$FT(^r@RjgOz_#Vz%D^|XT^Es%)hSZ9cYhphoyflDty=>EB
zAr0{;g@^mX;PD1^II!8M-A1i4y)V9$C7Xfig1*JD!QO>AvRY&_O)D3ylr)h+3xqT|
z`~G0|F-apL(9S)l*<ToEod6l~Baq=)#wrSdcIH*caLG`n=o!`~g#lA3qmZOy01-?q
z*=3lMAY%do`iT6!88jjWcu5LU83X2#AJPN_2hdAcSLw{tsFaa82V4AtWdvs?<rsBo
zg6mfds?I@)pElosFw(3NdYARlL604Ptdh-T0X?^{uK+s|J@(+kvy@_j|BW=ozX)$6
zBnK4lfjUMABa07n{gUx~!>5c1_FgPf)G%|NyNg-#yczI3YZuqlAglc2zX{=g8}Sdm
C^04**

literal 0
HcmV?d00001