[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17611] revert commit 17610
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17611] revert commit 17610 |
|
Date: |
Wed, 17 Jan 2018 12:54:39 -0500 (EST) |
Revision: 17611
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17611
Author: sigurdne
Date: 2018-01-17 12:54:38 -0500 (Wed, 17 Jan 2018)
Log Message:
-----------
revert commit 17610
Modified Paths:
--------------
trunk/booking/setup/phpgw_no.lang
trunk/booking/templates/base/allocation.xsl
trunk/booking/templates/base/css/base.css
trunk/phpgwapi/js/jquery/common.js
trunk/phpgwapi/templates/aalesund/css/sample.css
trunk/phpgwapi/templates/aalesund/head.tpl
Added Paths:
-----------
trunk/bookingfrontend/js/
trunk/index.php
trunk/login.php
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2018-01-17 13:26:17 UTC (rev 17610)
+++ trunk/booking/setup/phpgw_no.lang 2018-01-17 17:54:38 UTC (rev 17611)
@@ -717,4 +717,5 @@
ftp password booking no Ftp passord
last id booking no Siste ID
do not edit! booking no Ikke endre!
-approve booking no Godkjenn
\ No newline at end of file
+approve booking no Godkjenn
+return to application booking no Tilbake til søknad
\ No newline at end of file
Modified: trunk/booking/templates/base/allocation.xsl
===================================================================
--- trunk/booking/templates/base/allocation.xsl 2018-01-17 13:26:17 UTC (rev
17610)
+++ trunk/booking/templates/base/allocation.xsl 2018-01-17 17:54:38 UTC (rev
17611)
@@ -51,7 +51,7 @@
<div class="pure-control-group">
<button class="pure-button pure-button-primary">
<xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="allocation/application_link"/>"</xsl:attribute>
- <xsl:value-of select="php:function('lang',
'application')" />
+ <xsl:value-of select="php:function('lang', 'return to
application')" />
</button>
<xsl:if test="allocation/permission/write">
<button class="pure-button pure-button-primary">
Modified: trunk/booking/templates/base/css/base.css
===================================================================
--- trunk/booking/templates/base/css/base.css 2018-01-17 13:26:17 UTC (rev
17610)
+++ trunk/booking/templates/base/css/base.css 2018-01-17 17:54:38 UTC (rev
17611)
@@ -355,27 +355,3 @@
font-size: 110%;
}
-
-.table-event-color{
- background-color: #e24646 !important;
-}
-
-.table-allocation-color{
- background-color: #ff6d6d !important;
-}
-
-.table-closed-color{
- background-color: #e8e8e8 !important;
-}
-
-.table-free-color{
- background-color: #73d67a !important;
-}
-
-.table-booking-color{
- background-color: #f79999 !important;
-}
-
-#schedule_container a{
- color: #000;
-}
\ No newline at end of file
Copied: trunk/index.php (from rev 17608, trunk/index.php)
===================================================================
--- trunk/index.php (rev 0)
+++ trunk/index.php 2018-01-17 17:54:38 UTC (rev 17611)
@@ -0,0 +1,170 @@
+<?php
+ /**
+ * phpGroupWare
+ *
+ * @author Dave Hall <address@hidden>
+ * @author Others <unknown>
+ * @copyright Copyright (C) 2000-2008 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @version $Id$
+ */
+
+ /*
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ $phpgw_info = array();
+ if (!file_exists('header.inc.php'))
+ {
+ Header('Location: setup/index.php');
+ exit;
+ }
+
+ /**
+ * @global string $GLOBALS['sessionid']
+ * @internal FIXME this is ugly and probably not needed - skwashd jan08
+ */
+ $GLOBALS['sessionid'] = isset($_REQUEST['sessionid'])?
$_REQUEST['sessionid'] : '';
+
+ $invalid_data = false;
+ // This is the preliminary menuaction driver for the new multi-layered
design
+ if (isset($_GET['menuaction']) || isset($_POST['menuaction']))
+ {
+ if(isset($_GET['menuaction']))
+ {
+ list($app,$class,$method) =
explode('.',$_GET['menuaction']);
+ }
+ else
+ {
+ list($app,$class,$method) =
explode('.',$_POST['menuaction']);
+ }
+ if (! $app || ! $class || ! $method)
+ {
+ $invalid_data = true;
+ }
+ }
+ else
+ {
+ //$phpgw->log->message('W-BadmenuactionVariable, menuaction missing or
corrupt: %1',$menuaction);
+ //$phpgw->log->commit();
+
+ $app = 'home';
+ $invalid_data = true;
+ }
+
+ $api_requested = false;
+ if ($app == 'phpgwapi')
+ {
+ $app = 'home';
+ $api_requested = true;
+ }
+
+ $GLOBALS['phpgw_info']['flags'] = array
+ (
+ 'noheader' => true,
+ 'currentapp' => $app
+ );
+
+ /**
+ * Include phpgroupware header
+ */
+ require_once('header.inc.php');
+
+ if ($app == 'home' && ! $api_requested)
+ {
+ $GLOBALS['phpgw']->redirect_link('/home.php');
+ }
+
+ if ($api_requested)
+ {
+ $app = 'phpgwapi';
+ }
+
+ $GLOBALS[$class] = CreateObject("{$app}.{$class}");
+
+ if ( !$invalid_data
+ && is_object($GLOBALS[$class])
+ && isset($GLOBALS[$class]->public_functions)
+ && is_array($GLOBALS[$class]->public_functions)
+ && isset($GLOBALS[$class]->public_functions[$method])
+ && $GLOBALS[$class]->public_functions[$method] )
+
+ {
+ if ( phpgw::get_var('X-Requested-With', 'string', 'SERVER') ==
'XMLHttpRequest'
+ // deprecated
+ || phpgw::get_var('phpgw_return_as', 'string', 'GET')
== 'json' )
+ {
+ // comply with RFC 4627
+ header('Content-Type: application/json');
+ $return_data = $GLOBALS[$class]->$method();
+ echo json_encode($return_data);
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+
+ //If debug info is not triggered elsewhere.
+ if
(isset($GLOBALS['phpgw_info']['user']['apps']['admin']) && DEBUG_TIMER &&
!phpgwapi_cache::session_get($app,'id_debug'))
+ {
+ $debug_timer_stop = perfgetmicrotime();
+ //BTW: wil not destroy the json output - click
on the 'Debug-link' to view message
+ _debug_array(lang('page prepared in %1
seconds.', $debug_timer_stop - $GLOBALS['debug_timer_start'] ));
+ }
+
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+ else
+ {
+ if(phpgw::get_var('phpgw_return_as', 'string', 'GET')
=='noframes')
+ {
+ $GLOBALS['phpgw_info']['flags']['noframework']
= true;
+
$GLOBALS['phpgw_info']['flags']['headonly']=true;
+ }
+ $GLOBALS[$class]->$method();
+ }
+ unset($app);
+ unset($class);
+ unset($method);
+ unset($invalid_data);
+ unset($api_requested);
+ }
+ else
+ {
+ //FIXME make this handle invalid data better
+ if (! $app || ! $class || ! $method)
+ {
+ $GLOBALS['phpgw']->log->message(array(
+ 'text' => 'W-BadmenuactionVariable, menuaction
missing or corrupt: %1',
+ 'p1' => $menuaction,
+ 'line' => __LINE__,
+ 'file' => __FILE__
+ ));
+ }
+
+ if ( ( !isset($GLOBALS[$class]->public_functions)
+ || !is_array($GLOBALS[$class]->public_functions)
+ || !isset($GLOBALS[$class]->public_functions[$method])
+ || !$GLOBALS[$class]->public_functions[$method] )
+ && $method)
+ {
+ $GLOBALS['phpgw']->log->message(array(
+ 'text' => 'W-BadmenuactionVariable, attempted
to access private method: %1',
+ 'p1' => $method,
+ 'line' => __LINE__,
+ 'file' => __FILE__
+ ));
+ }
+ $GLOBALS['phpgw']->log->commit();
+
+ $GLOBALS['phpgw']->redirect_link('/home.php');
+ }
+ $GLOBALS['phpgw']->common->phpgw_footer();
Copied: trunk/login.php (from rev 17608, trunk/login.php)
===================================================================
--- trunk/login.php (rev 0)
+++ trunk/login.php 2018-01-17 17:54:38 UTC (rev 17611)
@@ -0,0 +1,17 @@
+<?php
+
+ /**
+ * phpGroupWare
+ *
+ * phpgroupware base
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2013 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @package phpgroupware
+ * @version $Id$
+ */
+
+ require_once 'phpgwapi/inc/class.login.inc.php';
+
+ $phpgwlogin = new phpgwapi_login;
+ $phpgwlogin->login();
Modified: trunk/phpgwapi/js/jquery/common.js
===================================================================
--- trunk/phpgwapi/js/jquery/common.js 2018-01-17 13:26:17 UTC (rev 17610)
+++ trunk/phpgwapi/js/jquery/common.js 2018-01-17 17:54:38 UTC (rev 17611)
@@ -1722,9 +1722,7 @@
var id = data[k]['id'];
var name = (data[k]['shortname']) ?
formatScheduleShorten(data[k]['shortname'], 9) :
formatScheduleShorten(data[k]['name'], 9);
var type = data[k]['type'];
- text = name;
-
- var color = tableColorSelector(type, text);
+ var colorCell = formatScheduleCellDateColumn(name, type);
var conflicts = new Array();
@@ -1736,13 +1734,13 @@
}
}
text = formatBackendScheduleDateColumn(id, name, type,
conflicts);
- classes = color + " " + type;
+ classes = colorCell + " " + type;
}
else
{
text = lang['free'] || "free";
// text = "free";
- classes = "table-free-color free";
+ classes = "free";
trFunction.push(
{
event: 'click',
@@ -1777,10 +1775,7 @@
{
var name = (data[k]['shortname']) ?
formatScheduleShorten(data[k]['shortname'], 9) :
formatScheduleShorten(data[k]['name'], 9);
var type = data[k]['type'];
- text = name;
-
- var color = tableColorSelector(type, text);
- //var colorCell = formatScheduleCellDateColumn(name, type);
+ var colorCell = formatScheduleCellDateColumn(name, type);
if (data[k]['is_public'] == 0)
{
@@ -1787,8 +1782,8 @@
name = formatScheduleShorten('Privat arr.', 9);
}
-
- classes = "cellInfo " + color + " " + type;
+ text = name;
+ classes = "cellInfo " + colorCell + " " + type;
trFunction.push(
{
event: 'click',
@@ -1799,11 +1794,11 @@
}
}
);
- }
+ }
else
{
text = lang['free'] || "free";
- classes = "table-free-color free";
+ classes = "free";
trFunction.push(
{
event: 'click',
@@ -2140,20 +2135,4 @@
if (d[10])
date.setMinutes(d[10]);
return date;
-};
-
-function tableColorSelector(type, text){
- var color = "";
-
- if(type === "event"){
- color = "table-event-color";
- } if(type === "allocation"){
- color = "table-allocation-color";
- } if(type === "booking"){
- color = "table-booking-color";
- } if(text === lang['closed'] || text === "closed" || text === "Stengt"){
- color = "table-closed-color";
- }
-
- return color;
-}
\ No newline at end of file
+};
\ No newline at end of file
Modified: trunk/phpgwapi/templates/aalesund/css/sample.css
===================================================================
--- trunk/phpgwapi/templates/aalesund/css/sample.css 2018-01-17 13:26:17 UTC
(rev 17610)
+++ trunk/phpgwapi/templates/aalesund/css/sample.css 2018-01-17 17:54:38 UTC
(rev 17611)
@@ -23,13 +23,6 @@
}
}
address@hidden screen and (max-width: 560px) {
- .header-container{
- border-bottom: 1.5px solid #89266a
- }
-}
-
-
a{
color: #26348B;
}
@@ -357,24 +350,4 @@
.card dt{
display: none;
-}
-
-.table-event-color{
- background-color: #e24646 !important;
-}
-
-.table-allocation-color{
- background-color: #ff6d6d !important;
-}
-
-.table-closed-color{
- background-color: #e8e8e8 !important;
-}
-
-.table-free-color{
- background-color: #73d67a !important;
-}
-
-.table-booking-color{
- background-color: #f79999 !important;
}
\ No newline at end of file
Modified: trunk/phpgwapi/templates/aalesund/head.tpl
===================================================================
--- trunk/phpgwapi/templates/aalesund/head.tpl 2018-01-17 13:26:17 UTC (rev
17610)
+++ trunk/phpgwapi/templates/aalesund/head.tpl 2018-01-17 17:54:38 UTC (rev
17611)
@@ -40,10 +40,10 @@
</head>
<body class="">
- <nav class="navbar navbar-expand-md navbar-light bg-faded">
+ <nav class="navbar navbar-expand-md">
<div class="container header-container">
- <button class="navbar-toggler navbar-toggler-right active"
type="button" data-toggle="collapse" data-target="#Navbar">
+ <button class="navbar-toggler mr-auto active"
type="button" data-toggle="collapse" data-target="#Navbar">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="{site_url}">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17611] revert commit 17610,
sigurdne <=