projects / koha_ffzg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 547243e)
revive IntranetmainUserblock syspref, three-column design for mainpage
authorJoshua Ferraro <jmf@liblime.com>
Sun, 30 Sep 2007 05:55:38 +0000 (00:55 -0500)
committerChris Cormack <crc@liblime.com>
Sun, 30 Sep 2007 08:06:26 +0000 (03:06 -0500)
Signed-off-by: Chris Cormack <crc@liblime.com>
C4/Auth.pm patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl patch | blob | history

diff --git a/C4/Auth.pm b/C4/Auth.pm
index c59360e..9aa17ae 100644 (file)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -253,6 +253,7 @@ sub get_template_and_user {
             virtualshelves          => C4::Context->preference("virtualshelves"),
             LibraryName             => C4::Context->preference("LibraryName"),
             KohaAdminEmailAddress   => "" . C4::Context->preference("KohaAdminEmailAddress"),
+                       IntranetmainUserblock   => C4::Context->preference("IntranetmainUserblock"),
         );
     }
     else {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 65f9030..2d8d584 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -4,34 +4,35 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
-       
-    <h1>Welcome to Koha</h1>
-    
+<div id="doc3">
+<div id="bd">
+       <div class="yui-gb">
+       <div class="yui-u first">
+       First Column
         <!-- TMPL_IF name="koha_news_count" -->
-            <p><!-- TMPL_VAR name="koha_news_count" --> recent news item(s)</p>
-            <table>
+               <div>
+            News
+                       <!-- TMPL_VAR name="koha_news_count" --> recent news item(s)
             <!-- TMPL_LOOP name="koha_news" -->
-                <tr>
-                <th>
-                    on <!-- TMPL_VAR name="newdate" -->, <!-- TMPL_VAR name="title" -->
-                </th>
-                               </tr>
-                <tr><td>
-                    <p><!-- TMPL_VAR name="new" --></p>
-                </td></tr>
+                     <!-- TMPL_VAR name="title" -->
+                                        on <!-- TMPL_VAR name="newdate" -->
+                    <!-- TMPL_VAR name="new" -->
             <!-- /TMPL_LOOP -->
-            </table>
+               </div>
         <!-- /TMPL_IF -->
-
+               <div>
+               <!-- TMPL_VAR NAME="IntranetmainUserblock" -->
+               </div>
+       </div>
+       <div class="yui-u">
+       Third Column
+       </div>
+       <div class="yui-u">
+       Second Column
+       </div>
 </div>
+<div id="ft">
+footer
 </div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Unnamed repository; edit this file 'description' to name the repository.