[Fmsystem-commits] [11662] API: configurable messages on login

[Sigurd Nes]

Revision: 11662
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11662
Author:   sigurdne
Date:     2014-02-07 14:41:04 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
API: configurable messages on login

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/templates/base/css/login.css
    trunk/phpgwapi/templates/base/login.tpl

Modified: trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php 2014-02-07 
12:10:56 UTC (rev 11661)
+++ trunk/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php 2014-02-07 
14:41:04 UTC (rev 11662)
@@ -42,6 +42,7 @@
                        $location_url = 
$c->config_data[$section]['location_url'];//'http://braarkiv.adm.bgo/service/services.asmx';
                        $braarkiv_user =  
$c->config_data[$section]['braarkiv_user'];
                        $braarkiv_pass =  
$c->config_data[$section]['braarkiv_pass'];
+//$location_url = 'http://braarkiv.adm.bgo/service/services.asmx';
 
                        if(!isset($c->config_data) || !$c->config_data)
                        {

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2014-02-07 12:10:56 UTC 
(rev 11661)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2014-02-07 14:41:04 UTC 
(rev 11662)
@@ -529,6 +529,9 @@
                        $this->tmpl->set_var('flag_no', $flag_no);
                        $this->tmpl->set_var('flag_en', $flag_en);
 
+                       $this->tmpl->set_var('login_left_message', 
$GLOBALS['phpgw_info']['login_left_message']);
+                       $this->tmpl->set_var('login_right_message', 
$GLOBALS['phpgw_info']['login_right_message']);
+
                        $autocomplete = '';
                        if ( 
isset($GLOBALS['phpgw_info']['server']['autocomplete_login'])
                                && 
$GLOBALS['phpgw_info']['server']['autocomplete_login'] )

Modified: trunk/phpgwapi/templates/base/css/login.css
===================================================================
--- trunk/phpgwapi/templates/base/css/login.css 2014-02-07 12:10:56 UTC (rev 
11661)
+++ trunk/phpgwapi/templates/base/css/login.css 2014-02-07 14:41:04 UTC (rev 
11662)
@@ -55,6 +55,9 @@
 
 #section-box  { float: right; width: 320px; margin-left: 10px;}
 
+#left-box  { float: left; width: 300px; margin-left:10px; margin-right:10px; 
margin-top: 50px;}
+#right-box  { float: right; width: 300px; margin-left:10px; margin-right:10px; 
margin-top: 50px;}
+
 #section-box .m {
   padding: 5px;
 }

Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl     2014-02-07 12:10:56 UTC (rev 
11661)
+++ trunk/phpgwapi/templates/base/login.tpl     2014-02-07 14:41:04 UTC (rev 
11662)
@@ -87,6 +87,13 @@
                </div>
 
                <div class="padding">
+                       <div id="left-box">
+                               {login_left_message}
+                       </div>
+                       <div id="right-box">
+                               {login_right_message}
+                       </div>
+                       
                        <div id="element-box" class="login">
                                <div class="t">
                                        <div class="t">
@@ -214,6 +221,7 @@
                        </div>
                        <noscript>Warning! JavaScript must be enabled for 
proper operation of the Administrator back-end.</noscript>
                        <div class="clr"></div>
+
                </div>
        </div>
        <div id="border-bottom">