fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [8659] bkbooking: nsf frontend top update


From: Kjell Arne Espedal
Subject: [Fmsystem-commits] [8659] bkbooking: nsf frontend top update
Date: Tue, 24 Jan 2012 09:45:25 +0000

Revision: 8659
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8659
Author:   kjell
Date:     2012-01-24 09:45:25 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
bkbooking: nsf frontend top update

Modified Paths:
--------------
    branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
    branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
    branches/dev-thomasez/phpgwapi/templates/bkbooking/head.tpl

Added Paths:
-----------
    
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/toppbanner_booking.png

Modified: branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang   2012-01-24 
08:35:18 UTC (rev 8658)
+++ branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang   2012-01-24 
09:45:25 UTC (rev 8659)
@@ -333,7 +333,7 @@
 Cancelation of booking from    bookingfrontend no      Avbestilling av booking 
fra
 To cancel booking use this link        bookingfrontend no      For å slette 
bookingen bruk lenken
 To cancel allocation use this link     bookingfrontend no      For å slette 
tildelingen bruk lenken
-manual common  no      Veiledning lag og organisasjoner
+manual common  no      Veiledning
 Cancel allocation      bookingfrontend no      Avbestill tildelinger
 House  bookingfrontend no      Hytte/hus
 Campsite       bookingfrontend no      Teltplass

Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css 
2012-01-24 08:35:18 UTC (rev 8658)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css 
2012-01-24 09:45:25 UTC (rev 8659)
@@ -300,26 +300,27 @@
 overflow: hidden;
 line-height: 1;
 width: 1000px;
-background-image: none !important;
-height: 140px !important;
+background: url(../images/toppbanner_booking.png) no-repeat!important;
+height: 145px!important;
 }
 
 #login-bar{
-margin-top:10px;
+float: left; 
+margin-top: 0px;
+margin-left: 630px;
 }
 
 #login-bar a{
-border-right: 1px solid #575757;
 padding: 0 0.5em;
-line-height: 1.2em;
+line-height: 0.9em;
+color: white;
 }
 
 #logo{
-background: url(../images/nsf/Alltidberedt_farger.png) no-repeat;
-float: left;
-height: 145px!important;
-width: 212px!important;
-margin: 0px 0 0 0px !important;
+height: 110px!important;
+width: 132px!important;
+margin: 0px 0px 0px 830px!important;
+/*background: url(../images/nsf/Alltidberedt_farger.png) no-repeat;*/
 }
 
 #centerimage{

Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/head.tpl
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/head.tpl 2012-01-24 
08:35:18 UTC (rev 8658)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/head.tpl 2012-01-24 
09:45:25 UTC (rev 8659)
@@ -32,17 +32,16 @@
 <body>
     <div id="wrapper">
     <div id="header">
-       <div id="login-bar">
-               <a href="{manual_url}">{manual_text}</a> <a 
href="{help_url}">{help_text}</a> <a class="login" 
href="{login_url}">{login_text}</a>
-       </div>
-        <a href="index.php?menuaction=bookingfrontend.uisearch.index"><div 
id="logo"></div></a>
+               <div id="login-bar">
+                       <a href="{manual_url}">{manual_text}</a> <a 
href="{help_url}">{help_text}</a> <a class="login" 
href="{login_url}">{login_text}</a>
+               </div>
                <div id="centerimage"></div>
                <form action="index.php" method="get" id="header-search" 
class="{header_search_class}">
-                       <input type="hidden" name="menuaction" 
value="bookingfrontend.uisearch.index" />
-               <input class="query
-" type="text" name="searchterm"/>
-               <xsl:text> </xsl:text><input type="submit" 
value="{lbl_search}"/>
+                               <input type="hidden" name="menuaction" 
value="bookingfrontend.uisearch.index" />
+               <input class="query" type="text" name="searchterm"/>
+                       <xsl:text> </xsl:text><input type="submit" 
value="{lbl_search}"/>
                </form>
+               <a 
href="index.php?menuaction=bookingfrontend.uisearch.index"><div 
id="logo"></div></a>
     </div>
 <div class="yui-skin-sam" id='frontend'>
 <div id="line"></div>

Added: 
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/toppbanner_booking.png
===================================================================
(Binary files differ)


Property changes on: 
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/toppbanner_booking.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream




reply via email to

[Prev in Thread] Current Thread [Next in Thread]