[Fmsystem-commits] [15924] more on template

[sigurdne]

Revision: 15924
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15924
Author:   sigurdne
Date:     2016-11-01 08:05:48 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
more on template

Modified Paths:
--------------
    trunk/bookingfrontend/js/bookingfrontend/search.js
    trunk/bookingfrontend/templates/base/config.tpl
    trunk/bookingfrontend/templates/base/search.xsl
    trunk/phpgwapi/templates/bookingfrontend/footer.tpl
    trunk/phpgwapi/templates/bookingfrontend/head.inc.php
    trunk/phpgwapi/templates/bookingfrontend/navbar.inc.php

Modified: trunk/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- trunk/bookingfrontend/js/bookingfrontend/search.js  2016-10-31 18:50:06 UTC 
(rev 15923)
+++ trunk/bookingfrontend/js/bookingfrontend/search.js  2016-11-01 08:05:48 UTC 
(rev 15924)
@@ -227,6 +227,9 @@
                                        $("#no_result").hide();
                                        $("#result").html(data);
                                        
$("#total_records_top").html($("#total_records").html());
+
+                                       var top = 
$("#total_records_top").position().top;
+                                       $(window).scrollTop( top );
                                }
                        }
                });

Modified: trunk/bookingfrontend/templates/base/config.tpl
===================================================================
--- trunk/bookingfrontend/templates/base/config.tpl     2016-10-31 18:50:06 UTC 
(rev 15923)
+++ trunk/bookingfrontend/templates/base/config.tpl     2016-11-01 08:05:48 UTC 
(rev 15924)
@@ -16,6 +16,10 @@
                        <td>{lang_site_title}</td>
                        <td><input name="newsettings[site_title]" 
value="{value_site_title}"></td>
                </tr>
+               <tr class="row_on">
+                       <td>{lang_footer_info}</td>
+                       <td><input name="newsettings[footer_info]" 
value="{value_footer_info}"></td>
+               </tr>
                <tr class="row_off">
                        <td>{lang_remote_authentication}:</td>
                        <td>

Modified: trunk/bookingfrontend/templates/base/search.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/search.xsl     2016-10-31 18:50:06 UTC 
(rev 15923)
+++ trunk/bookingfrontend/templates/base/search.xsl     2016-11-01 08:05:48 UTC 
(rev 15924)
@@ -11,16 +11,16 @@
                </p>
        </div>
        <div class="content">
-       <div class="pure-g">
-               <xsl:if test="not(search)">
-                       <div class="pure-u-1" id="no_result">
-                               <div id="cloud">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="frontpagetext"/>
+               <div class="pure-g">
+                       <xsl:if test="not(search)">
+                               <div class="pure-u-1" id="no_result">
+                                       <div id="cloud">
+                                               <xsl:value-of 
disable-output-escaping="yes" select="frontpagetext"/>
+                                       </div>
                                </div>
-                       </div>
-               </xsl:if>
+                       </xsl:if>
+               </div>
        </div>
-       </div>
        <div class="content">
                <form method="GET" id="search">
                        <input type="hidden" id="menuaction" name="menuaction" 
value="bookingfrontend.uisearch.index" />
@@ -29,7 +29,6 @@
                <div class="pure-g">
                        <div class="pure-u-1 pure-u-lg-1-2">
                                
-                               <div id = "total_records_top"></div>
                                <div class="pure-u-1">
                                        <div class="heading">
                                                <xsl:value-of 
select="php:function('lang', 'building')" />
@@ -188,12 +187,13 @@
                                
                        </div>
                        <div class="pure-u-1 pure-u-lg-1-2">
+                               <div id = "total_records_top"></div>
                                <div id="result"></div>
                        </div>
 
                </div>
-               <div class="pure-g">
-                       <xsl:if test="search = '1'">
+               <xsl:if test="not(search)">
+                       <div class="pure-g">
                                <div class="pure-u-1  pure-u-lg-1-1" 
id="no_result">
                                        <div id="cloud">
                                                <div class="frontpagetext">
@@ -207,7 +207,7 @@
                                                </img>
                                        </div>
                                </div>
-                       </xsl:if>
-               </div>
+                       </div>
+               </xsl:if>
        </div>
 </xsl:template>

Modified: trunk/phpgwapi/templates/bookingfrontend/footer.tpl
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/footer.tpl 2016-10-31 18:50:06 UTC 
(rev 15923)
+++ trunk/phpgwapi/templates/bookingfrontend/footer.tpl 2016-11-01 08:05:48 UTC 
(rev 15924)
@@ -3,7 +3,7 @@
 
 </div>
 <div class="footer l-box is-center">
-       {footer_address}
+       {footer_info}
 </div>
 </body>
 {javascript_end}

Modified: trunk/phpgwapi/templates/bookingfrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/head.inc.php       2016-10-31 
18:50:06 UTC (rev 15923)
+++ trunk/phpgwapi/templates/bookingfrontend/head.inc.php       2016-11-01 
08:05:48 UTC (rev 15924)
@@ -155,7 +155,14 @@
                $site_title = $GLOBALS['phpgw_info']['server']['site_title'];
        }
 
-    $test = $GLOBALS['phpgw']->common->get_on_events();
+       if(! $footer_info = $config_frontend['footer_info'])
+       {
+               $footer_info = 'footer info settes i bookingfrontend config';
+       }
+
+   phpgwapi_cache::session_set('phpgwapi', 'footer_info', $footer_info);
+
+       $test = $GLOBALS['phpgw']->common->get_on_events();
     $test = str_replace('window.onload = 
function()','$(document).ready(function()',$test);
     $test = str_replace("\n}\n","\n})\n",$test);
        $app = lang($app);

Modified: trunk/phpgwapi/templates/bookingfrontend/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/bookingfrontend/navbar.inc.php     2016-10-31 
18:50:06 UTC (rev 15923)
+++ trunk/phpgwapi/templates/bookingfrontend/navbar.inc.php     2016-11-01 
08:05:48 UTC (rev 15924)
@@ -32,9 +32,10 @@
                $GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
                $GLOBALS['phpgw']->template->set_file('footer', 'footer.tpl');
 
+               $footer_info = phpgwapi_cache::session_get('phpgwapi', 
'footer_info');
                $var = array
                (
-                       'footer_address'        => 'Bergen kommune | 
R&aring;dhusgt 10 | Postboks 7700 | 5020 Bergen',
+                       'footer_info'   => $footer_info, //'Bergen kommune | 
R&aring;dhusgt 10 | Postboks 7700 | 5020 Bergen',
                        'powered_by'    => lang('Powered by phpGroupWare 
version %1', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
                        'javascript_end'=> 
$GLOBALS['phpgw']->common->get_javascript_end()
                );