[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17070] more on eventplanner
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [17070] more on eventplanner |
Date: |
Wed, 13 Sep 2017 14:29:49 -0400 (EDT) |
Revision: 17070
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17070
Author: sigurdne
Date: 2017-09-13 14:29:49 -0400 (Wed, 13 Sep 2017)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/phpgwapi/setup/phpgw_no.lang
trunk/phpgwapi/templates/frontend/head.inc.php
trunk/phpgwapi/templates/frontend/navbar.inc.php
Added Paths:
-----------
trunk/phpgwapi/templates/frontend/js/mmenu.js
Modified: trunk/phpgwapi/setup/phpgw_no.lang
===================================================================
--- trunk/phpgwapi/setup/phpgw_no.lang 2017-09-13 14:05:50 UTC (rev 17069)
+++ trunk/phpgwapi/setup/phpgw_no.lang 2017-09-13 18:29:49 UTC (rev 17070)
@@ -60,7 +60,7 @@
groups common no Grupper
help common no Hjelp
high common no Høy
-home common no Hjemme
+home common no Hjem
it has been more then %1 days since you changed your password common no
Det er mer enn %1 dager siden du har endet ditt passord
january common no Januar
july common no Juli
Modified: trunk/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/head.inc.php 2017-09-13 14:05:50 UTC
(rev 17069)
+++ trunk/phpgwapi/templates/frontend/head.inc.php 2017-09-13 18:29:49 UTC
(rev 17070)
@@ -71,7 +71,6 @@
$stylesheets[] = "/{$app}/templates/base/css/base.css";
// $stylesheets[] = "/{$app}/css/frontend.css";
$stylesheets[] = "/phpgwapi/templates/frontend/css/frontend.css";
-// $stylesheets[] = "/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.css";
$stylesheets[] =
"/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.all.css";
if (!preg_match('/Firefox/i', $_SERVER['HTTP_USER_AGENT']))
@@ -98,7 +97,7 @@
$javascripts = array();
$javascripts[] =
"/phpgwapi/js/jquery/mmenu/core/js/jquery.mmenu.min.all.js";
- $javascripts[] = "/phpgwapi/templates/pure/js/mmenu.js";
+ $javascripts[] = "/phpgwapi/templates/frontend/js/mmenu.js";
//FIXME: To consider...
@@ -177,6 +176,12 @@
$home_text = lang('home');
$manual_text = lang('manual');
+
+ if(preg_match('/home.php$/i', $_SERVER['SCRIPT_NAME']))
+ {
+ $home_text = '';
+ }
+
$user = $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] );
if($user && isset($_SESSION['phpgw_session']['session_flags']) &&
$_SESSION['phpgw_session']['session_flags'] == 'N')
Added: trunk/phpgwapi/templates/frontend/js/mmenu.js
===================================================================
--- trunk/phpgwapi/templates/frontend/js/mmenu.js
(rev 0)
+++ trunk/phpgwapi/templates/frontend/js/mmenu.js 2017-09-13 18:29:49 UTC
(rev 17070)
@@ -0,0 +1,74 @@
+$(function ()
+{
+
+ var HomeUrl = phpGWLink('home.php', {}, false);
+
+// The menu
+ $('#menu').mmenu({
+ extensions: ['effect-slide-menu', 'pageshadow'],
+ // searchfield: false,
+ counters: true,
+ header: {
+ add: true,
+ update: true
+ },
+ navbar: {
+ // title : 'Advanced menu'
+ },
+ navbars: [
+ {
+ position: 'top',
+ content: [
+ 'prev',
+ 'title',
+ 'close'
+ ]
+ }
+
+ ]
+ });
+
+});
+
+$(document).ready(function ()
+{
+ $(window).resize(function ()
+ {
+ var width = $(window).width();
+ if (width < 620)
+ {
+ $('.pure-form-aligned').each(function (i, obj)
+ {
+
$(this).removeClass('pure-form-aligned').addClass('pure-form-stacked');
+ });
+ $('.pure-input-1-2').each(function (i, obj)
+ {
+
$(this).removeClass('pure-input-1-2').addClass('pure-input-1');
+ });
+ $('.pure-u-3-4').each(function (i, obj)
+ {
+
$(this).removeClass('pure-u-3-4').addClass('pure-u-5-6');
+ });
+ }
+// else if (resized == true && width > 620)
+// {
+// $('.pure-form-stacked').each(function (i, obj)
+// {
+//
$(this).removeClass('pure-form-stacked').addClass('pure-form-aligned');
+// });
+// $('.pure-input-1').each(function (i, obj)
+// {
+//
$(this).removeClass('pure-input-1').addClass('pure-input-1-2');
+// });
+// $('.pure-u-5-6').each(function (i, obj)
+// {
+//
$(this).removeClass('pure-u-5-6').addClass('pure-u-3-4');
+// });
+// resized = false;
+//
+// }
+
+ }).resize();//trigger the resize event on page load.
+
+});
+
Modified: trunk/phpgwapi/templates/frontend/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/frontend/navbar.inc.php 2017-09-13 14:05:50 UTC
(rev 17069)
+++ trunk/phpgwapi/templates/frontend/navbar.inc.php 2017-09-13 18:29:49 UTC
(rev 17070)
@@ -81,7 +81,7 @@
{
$item['text'] = "<b>[ {$item['text']} ]</b>";
}
-
+/// _debug_array($GLOBALS);die();
$link_class = $current_class ? "class=\"{$current_class}\"" :
'';
$out = <<<HTML
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17070] more on eventplanner,
sigurdne <=