[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16193] More on eventplanner
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16193] More on eventplanner |
|
Date: |
Wed, 25 Jan 2017 15:44:54 -0500 (EST) |
Revision: 16193
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16193
Author: sigurdne
Date: 2017-01-25 15:44:54 -0500 (Wed, 25 Jan 2017)
Log Message:
-----------
More on eventplanner
Modified Paths:
--------------
trunk/eventplannerfrontend/inc/class.menu.inc.php
trunk/eventplannerfrontend/setup/default_records.inc.php
trunk/phpgwapi/templates/frontend/css/frontend.css
trunk/phpgwapi/templates/frontend/head.inc.php
Modified: trunk/eventplannerfrontend/inc/class.menu.inc.php
===================================================================
--- trunk/eventplannerfrontend/inc/class.menu.inc.php 2017-01-25 15:58:32 UTC
(rev 16192)
+++ trunk/eventplannerfrontend/inc/class.menu.inc.php 2017-01-25 20:44:54 UTC
(rev 16193)
@@ -40,7 +40,8 @@
public function get_menu()
{
$incoming_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $GLOBALS['phpgw_info']['flags']['currentapp'] =
'eventplanner';
+ $GLOBALS['phpgw_info']['flags']['currentapp'] =
'eventplannerfrontend';
+ $GLOBALS['phpgw']->translation->add_app('eventplanner');
$menus['navbar'] = array(
'eventplannerfrontend' => array(
@@ -53,40 +54,52 @@
);
$menus['toolbar'] = array();
+ if
(isset($GLOBALS['phpgw_info']['user']['apps']['admin']))
+ {
+ $menus['admin'] = array
+ (
+ 'index' => array
+ (
+ 'text' => lang('Configuration'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index',
+ 'appname' =>
'eventplannerfrontend'))
+ )
+ );
+ }
$menus['navigation'] = array(
'application' => array(
'text' => lang('application'),
- 'url' =>
$GLOBALS['phpgw']->link('eventplannerfrontend/', array('menuaction' =>
'eventplannerfrontend.uiapplication.index'))
+ 'url' =>
phpgwapi_uicommon_jquery::link( array('menuaction' =>
'eventplannerfrontend.uiapplication.index'))
),
'events' => array(
'text' => lang('events'),
- 'url' =>
$GLOBALS['phpgw']->link('eventplannerfrontend/', array('menuaction' =>
"eventplannerfrontend.uievents.index")),
+ 'url' =>
phpgwapi_uicommon_jquery::link( array('menuaction' =>
"eventplannerfrontend.uievents.index")),
'image' => array('events', 'navbar'),
),
'customer' => array(
'text' => lang('customer'),
- 'url' =>
$GLOBALS['phpgw']->link('eventplannerfrontend/', array('menuaction' =>
"eventplannerfrontend.uicustomer.index")),
+ 'url' =>
phpgwapi_uicommon_jquery::link( array('menuaction' =>
"eventplannerfrontend.uicustomer.index")),
'image' => array('customer', 'navbar'),
),
'vendor' => array(
'text' => lang('vendor'),
- 'url' =>
$GLOBALS['phpgw']->link('eventplannerfrontend/', array('menuaction' =>
"eventplannerfrontend.uivendor.index")),
+ 'url' =>
phpgwapi_uicommon_jquery::link( array('menuaction' =>
"eventplannerfrontend.uivendor.index")),
'image' => array('vendor', 'navbar'),
),
'booking' => array(
'text' => lang('booking'),
- 'url' =>
$GLOBALS['phpgw']->link('eventplannerfrontend/', array('menuaction' =>
"eventplannerfrontend.uibooking.index")),
+ 'url' =>
phpgwapi_uicommon_jquery::link( array('menuaction' =>
"eventplannerfrontend.uibooking.index")),
'image' => array('customer', 'navbar'),
),
'vendor_report' => array(
'text' => lang('vendor report'),
- 'url' =>
$GLOBALS['phpgw']->link('eventplannerfrontend/', array('menuaction' =>
"eventplannerfrontend.uivendor_report.index")),
+ 'url' =>
phpgwapi_uicommon_jquery::link( array('menuaction' =>
"eventplannerfrontend.uivendor_report.index")),
'image' => array('vendor_report',
'navbar'),
),
'customer_report' => array(
'text' => lang('customer report'),
- 'url' =>
$GLOBALS['phpgw']->link('eventplannerfrontend/', array('menuaction' =>
"eventplannerfrontend.uicustomer_report.index")),
+ 'url' =>
phpgwapi_uicommon_jquery::link( array('menuaction' =>
"eventplannerfrontend.uicustomer_report.index")),
'image' => array('customer_report',
'navbar'),
)
);
Modified: trunk/eventplannerfrontend/setup/default_records.inc.php
===================================================================
--- trunk/eventplannerfrontend/setup/default_records.inc.php 2017-01-25
15:58:32 UTC (rev 16192)
+++ trunk/eventplannerfrontend/setup/default_records.inc.php 2017-01-25
20:44:54 UTC (rev 16193)
@@ -36,7 +36,7 @@
$preferences = createObject('phpgwapi.preferences');
$preferences->set_account_id($eventplannerguest);
- $preferences->add('common', 'template_set', 'bookingfrontend');
+ $preferences->add('common', 'template_set', 'frontend');
$preferences->save_repository(true, $GLOBALS['type']);
$config = CreateObject('phpgwapi.config',
'eventplannerfrontend');
$config->read();
@@ -45,10 +45,14 @@
$config->save_repository();
}
- $eventplannerguest =
$GLOBALS['phpgw']->accounts->name2id('eventplannerguest');
+ if(!$eventplannerguest)
+ {
+ $eventplannerguest =
$GLOBALS['phpgw']->accounts->name2id('eventplannerguest');
+ }
$aclobj = & $GLOBALS['phpgw']->acl;
$aclobj->set_account_id($eventplannerguest, true);
+ $aclobj->add('phpgwapi', 'anonymous', 1);
$aclobj->add('eventplannerfrontend', 'run', 1);
$aclobj->add('eventplannerfrontend', '.application', 1);
$aclobj->add('eventplannerfrontend', '.resource', 1);
Modified: trunk/phpgwapi/templates/frontend/css/frontend.css
===================================================================
--- trunk/phpgwapi/templates/frontend/css/frontend.css 2017-01-25 15:58:32 UTC
(rev 16192)
+++ trunk/phpgwapi/templates/frontend/css/frontend.css 2017-01-25 20:44:54 UTC
(rev 16193)
@@ -1,4 +1,35 @@
+
+nav:not(.mm-menu)
+{
+ display: none;
+}
+
+
+.header.mm-fixed-top
+{
+ position: fixed;
+ top: 0;
+ left: 0;
+}
+
+
+.header a
+{
+ background: center center no-repeat transparent;
+ background-image: url(
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADhJREFUeNpi/P//PwOtARMDHQBdLGFBYtMq3BiHT3DRPU4YR4NrNAmPJuHRJDyahEeT8Ii3BCDAAF0WBj5Er5idAAAAAElFTkSuQmCC
);
+ display: block;
+ width: 40px;
+ height: 40px;
+ position: absolute;
+ top: 16px;
+ left: 10px;
+}
+
+.pure-menu-heading {
+ padding: 0.5em 3em;
+}
+
/**
From example marketing.css
*/
@@ -73,6 +104,8 @@
}
.home-menu {
background: #2d3e50;
+ background: #DF0101;
+
}
.pure-menu.pure-menu-fixed {
/* Fixed menus normally have a border at the bottom. */
Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php 2017-01-25 15:58:32 UTC
(rev 16192)
+++ trunk/phpgwapi/templates/frontend/head.inc.php 2017-01-25 20:44:54 UTC
(rev 16193)
@@ -45,8 +45,6 @@
phpgwapi_jquery::load_widget('core');
$stylesheets = array();
- $stylesheets[] = "/phpgwapi/templates/pure/css/global.css";
- $stylesheets[] = "/phpgwapi/templates/pure/css/demo_mmenu.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
$stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
$stylesheets[] =
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
@@ -53,6 +51,7 @@
$stylesheets[] =
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
$stylesheets[] = "/{$app}/templates/base/css/base.css";
$stylesheets[] = "/{$app}/css/frontend.css";
+ $stylesheets[] =
"/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.all.css";
$stylesheets[] = "/phpgwapi/templates/frontend/css/frontend.css";
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
@@ -60,7 +59,6 @@
$stylesheets[] =
"/phpgwapi/templates/frontend/themes/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
$stylesheets[] =
"/{$app}/templates/frontend/themes/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
- $stylesheets[] =
"/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.all.css";
foreach ( $stylesheets as $stylesheet )
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16193] More on eventplanner,
sigurdne <=