[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11056] more on mobilefrontend
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11056] more on mobilefrontend |
Date: |
Fri, 12 Apr 2013 10:42:20 +0000 |
Revision: 11056
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11056
Author: sigurdne
Date: 2013-04-12 10:42:20 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
more on mobilefrontend
Modified Paths:
--------------
trunk/mobilefrontend/controller/class.uicalendar.inc.php
trunk/mobilefrontend/controller/class.uicase.inc.php
trunk/mobilefrontend/controller/class.uicheck_list.inc.php
trunk/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
trunk/mobilefrontend/controller/class.uicontrol.inc.php
trunk/mobilefrontend/controller/class.uicontrol_group.inc.php
trunk/mobilefrontend/controller/class.uicontrol_group_component.inc.php
trunk/mobilefrontend/controller/class.uicontrol_item.inc.php
trunk/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
trunk/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
trunk/mobilefrontend/controller/class.uidocument.inc.php
trunk/mobilefrontend/controller/class.uiprocedure.inc.php
trunk/mobilefrontend/home.php
trunk/mobilefrontend/property/class.uitts.inc.php
trunk/phpgwapi/templates/mobilefrontend/css/frontend.css
trunk/phpgwapi/templates/mobilefrontend/head.inc.php
trunk/phpgwapi/templates/mobilefrontend/head.tpl
trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php
trunk/phpgwapi/templates/mobilefrontend/navbar.tpl
trunk/property/inc/class.uitts.inc.php
Modified: trunk/mobilefrontend/controller/class.uicalendar.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uicalendar.inc.php 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uicalendar.inc.php 2013-04-12
10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: trunk/mobilefrontend/controller/class.uicase.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uicase.inc.php 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uicase.inc.php 2013-04-12
10:42:20 UTC (rev 11056)
@@ -36,6 +36,7 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
//FIXME
$GLOBALS['phpgw']->css->add_external_file('controller/templates/mobilefrontend/css/base.css');
}
Modified: trunk/mobilefrontend/controller/class.uicheck_list.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uicheck_list.inc.php 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uicheck_list.inc.php 2013-04-12
10:42:20 UTC (rev 11056)
@@ -35,7 +35,7 @@
public function __construct()
{
parent::__construct();
-
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
//FIXME
$GLOBALS['phpgw']->css->add_external_file('controller/templates/mobilefrontend/css/base.css');
}
Modified:
trunk/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
2013-04-12 08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
2013-04-12 10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: trunk/mobilefrontend/controller/class.uicontrol.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uicontrol.inc.php 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uicontrol.inc.php 2013-04-12
10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: trunk/mobilefrontend/controller/class.uicontrol_group.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uicontrol_group.inc.php
2013-04-12 08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uicontrol_group.inc.php
2013-04-12 10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
trunk/mobilefrontend/controller/class.uicontrol_group_component.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uicontrol_group_component.inc.php
2013-04-12 08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uicontrol_group_component.inc.php
2013-04-12 10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: trunk/mobilefrontend/controller/class.uicontrol_item.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uicontrol_item.inc.php
2013-04-12 08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uicontrol_item.inc.php
2013-04-12 10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
trunk/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
===================================================================
---
trunk/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
2013-04-12 08:11:55 UTC (rev 11055)
+++
trunk/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
2013-04-12 10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
trunk/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
===================================================================
---
trunk/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
2013-04-12 08:11:55 UTC (rev 11055)
+++
trunk/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
2013-04-12 10:42:20 UTC (rev 11056)
@@ -37,5 +37,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: trunk/mobilefrontend/controller/class.uidocument.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uidocument.inc.php 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uidocument.inc.php 2013-04-12
10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: trunk/mobilefrontend/controller/class.uiprocedure.inc.php
===================================================================
--- trunk/mobilefrontend/controller/class.uiprocedure.inc.php 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/controller/class.uiprocedure.inc.php 2013-04-12
10:42:20 UTC (rev 11056)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: trunk/mobilefrontend/home.php
===================================================================
--- trunk/mobilefrontend/home.php 2013-04-12 08:11:55 UTC (rev 11055)
+++ trunk/mobilefrontend/home.php 2013-04-12 10:42:20 UTC (rev 11056)
@@ -18,7 +18,7 @@
$GLOBALS['phpgw_info']['flags'] = array
(
'noheader' => true,
- 'nonavbar' => false,
+ 'nonavbar' => true,
'currentapp' => 'home',
'enable_network_class' => true,
'enable_contacts_class' => true,
Modified: trunk/mobilefrontend/property/class.uitts.inc.php
===================================================================
--- trunk/mobilefrontend/property/class.uitts.inc.php 2013-04-12 08:11:55 UTC
(rev 11055)
+++ trunk/mobilefrontend/property/class.uitts.inc.php 2013-04-12 10:42:20 UTC
(rev 11056)
@@ -35,5 +35,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: trunk/phpgwapi/templates/mobilefrontend/css/frontend.css
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/css/frontend.css 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/phpgwapi/templates/mobilefrontend/css/frontend.css 2013-04-12
10:42:20 UTC (rev 11056)
@@ -322,7 +322,27 @@
line-height: 1.2em;
}
+#app-menu{
+margin: 0 0 0 16px !important;
+}
+#app-menu a{
+border-right: 1px solid #575757;
+padding: 0 0.5em;
+line-height: 1.2em;
+}
+
+#applications{
+margin: 0 0 0 16px !important;
+}
+
+#applications a{
+border-right: 1px solid #575757;
+padding: 0 0.5em;
+line-height: 1.2em;
+}
+
+
#logo{
background: url(../images/newlayout/logo.png) no-repeat;
float: left;
Modified: trunk/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/phpgwapi/templates/mobilefrontend/head.inc.php 2013-04-12
10:42:20 UTC (rev 11056)
@@ -59,30 +59,7 @@
}
}
- // Construct navbar_config by taking into account the current selected
menu
- // The only problem with this loop is that leafnodes will be included
- $navbar_config = execMethod('phpgwapi.template_portico.retrieve_local',
'navbar_config');
- if( isset($GLOBALS['phpgw_info']['flags']['menu_selection']) )
- {
- if(!isset($navbar_config))
- {
- $navbar_config = array();
- }
-
- $current_selection =
$GLOBALS['phpgw_info']['flags']['menu_selection'];
-
- while($current_selection)
- {
- $navbar_config["navbar::$current_selection"] = true;
- $current_selection = implode("::", explode("::",
$current_selection, -1));
- }
-
- phpgwapi_template_portico::store_local('navbar_config',
$navbar_config);
- }
-
- $_navbar_config = json_encode($navbar_config);
-
$app = lang($app);
$tpl_vars = array
(
@@ -93,7 +70,7 @@
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
- 'navbar_config' => $_navbar_config,
+ 'current_app_header' =>
isset($GLOBALS['phpgw_info']['flags']['app_header']) &&
$GLOBALS['phpgw_info']['flags']['app_header'] ?
$GLOBALS['phpgw_info']['flags']['app_header'] : ''
);
$tpl_vars['home_text'] = lang('home');
Modified: trunk/phpgwapi/templates/mobilefrontend/head.tpl
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/head.tpl 2013-04-12 08:11:55 UTC
(rev 11055)
+++ trunk/phpgwapi/templates/mobilefrontend/head.tpl 2013-04-12 10:42:20 UTC
(rev 11056)
@@ -36,9 +36,12 @@
<a href="{home_url}">{home_text}</a>
<a href="{logout_url}">{logout_text}</a>
</div>
+ <div id="app_header">{current_app_header}</div>
<!--<div id="logo"> </div>
<div id="centerimage"></div>-->
</div>
<div class="yui-skin-sam" id='frontend'>
<div id="line"></div>
<div style='margin:0; padding: 0; line-height:
0'> </div>
+
+
Modified: trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php 2013-04-12
08:11:55 UTC (rev 11055)
+++ trunk/phpgwapi/templates/mobilefrontend/navbar.inc.php 2013-04-12
10:42:20 UTC (rev 11056)
@@ -2,14 +2,10 @@
function parse_navbar($force = False)
{
- $navbar = array();
-// if(!isset($GLOBALS['phpgw_info']['flags']['nonavbar']) ||
!$GLOBALS['phpgw_info']['flags']['nonavbar'])
- {
- $navbar = execMethod('phpgwapi.menu.get', 'navbar');
- }
$user = $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] );
+/*
$var = array
(
'home_url' =>
$GLOBALS['phpgw']->link('/home.php'),
@@ -22,6 +18,38 @@
'user_fullname' => $user->__toString()
);
+*/
+
+ if(!isset($GLOBALS['phpgw_info']['flags']['nonavbar']) ||
!$GLOBALS['phpgw_info']['flags']['nonavbar'])
+ {
+ $currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $applications = '';
+ $exclude = array('home', 'about', 'logout');
+ $navbar = execMethod('phpgwapi.menu.get', 'navbar');
+ prepare_navbar($navbar);
+ foreach ( $navbar as $app => $app_data )
+ {
+ if ( in_array($app, $exclude) )
+ {
+ continue;
+ }
+ if ( $app == $currentapp)
+ {
+ $app_data['text'] =
"[<b>{$app_data['text']}</b>]";
+ }
+
+ $applications .= <<<HTML
+ <a
href="{$app_data['url']}">{$app_data['text']}</a>
+HTML;
+ }
+
+ $var['applications'] = $applications;
+
+ $menu_array =
execMethod('phpgwapi.menu.get_local_menu', $currentapp);
+ $var['app_menu'] =
phpgwapi_menu::render_horisontal_menu($menu_array);
+ }
+
+/*
if ( $GLOBALS['phpgw']->acl->check('run', PHPGW_ACL_READ,
'preferences') )
{
$var['preferences_url'] =
$GLOBALS['phpgw']->link('/preferences/index.php');
@@ -54,14 +82,22 @@
$var['debug_text'] = lang('debug');
$var['debug_icon'] = 'icon icon-debug';
}
-
+*/
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
$GLOBALS['phpgw']->template->set_file('navbar', 'navbar.tpl');
$flags = &$GLOBALS['phpgw_info']['flags'];
$var['current_app_title'] = isset($flags['app_header']) ?
$flags['app_header'] : lang($GLOBALS['phpgw_info']['flags']['currentapp']);
$flags['menu_selection'] = isset($flags['menu_selection']) ?
$flags['menu_selection'] : '';
+//
+ $controller_url = $GLOBALS['phpgw']->link( '/index.php',
array('menuaction' => 'controller.uicontrol.control_list') );
+ $controller_text = lang('controller');
+ $tts_url = $GLOBALS['phpgw']->link( '/index.php', array('menuaction' =>
'property.uitts.index') );
+ $tts_text = lang('ticket');
+
+//
+
$GLOBALS['phpgw']->template->set_var($var);
$GLOBALS['phpgw']->template->pfp('out','navbar');
Modified: trunk/phpgwapi/templates/mobilefrontend/navbar.tpl
===================================================================
--- trunk/phpgwapi/templates/mobilefrontend/navbar.tpl 2013-04-12 08:11:55 UTC
(rev 11055)
+++ trunk/phpgwapi/templates/mobilefrontend/navbar.tpl 2013-04-12 10:42:20 UTC
(rev 11056)
@@ -1 +1,5 @@
-
\ No newline at end of file
+<!-- BEGIN navbar -->
+ <div id="applications">{applications}</div>
+ <div id="app-menu">{app_menu}</div>
+<!-- END navbar -->
+
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2013-04-12 08:11:55 UTC (rev
11055)
+++ trunk/property/inc/class.uitts.inc.php 2013-04-12 10:42:20 UTC (rev
11056)
@@ -446,7 +446,7 @@
if( phpgw::get_var('phpgw_return_as') != 'json' )
{
- $datatable['menu']
= $this->bocommon->get_menu();
+// $datatable['menu']
= $this->bocommon->get_menu();
$datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
(
'menuaction' =>
'property.uitts.index',
@@ -1357,6 +1357,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
$this->simple ? 'tts.index.simple' : 'tts.index' , 'property' );
+
}
function index2()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11056] more on mobilefrontend,
Sigurd Nes <=