[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16340] table: Merge 16337:16339 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16340] table: Merge 16337:16339 from trunk |
|
Date: |
Sun, 19 Feb 2017 08:40:35 -0500 (EST) |
Revision: 16340
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16340
Author: sigurdne
Date: 2017-02-19 08:40:34 -0500 (Sun, 19 Feb 2017)
Log Message:
-----------
table: Merge 16337:16339 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/_config.yml
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/bower.json
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/gulpfile.coffee
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/jqtree.jquery.json
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/karma.conf.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/node_element.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/scroll_handler.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/util.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/version.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/package.json
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
branches/Version-2_0-branch/phpgwapi/templates/base/css/login.css
branches/Version-2_0-branch/phpgwapi/templates/base/login.tpl
branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
branches/Version-2_0-branch/registration/templates/base/user_edit.xsl
Removed Paths:
-------------
branches/Version-2_0-branch/phpgwapi/templates/base/css/ie6.css
branches/Version-2_0-branch/phpgwapi/templates/base/css/ie7.css
branches/Version-2_0-branch/phpgwapi/templates/base/css/joomla_general.css
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch 2017-02-19 13:40:34 UTC (rev 16340)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16300
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339
\ No newline at end of property
Modified: branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/inc/sso/include_login.inc.php
2017-02-19 13:40:34 UTC (rev 16340)
@@ -532,6 +532,12 @@
$this->tmpl->set_var('template_set',
$GLOBALS['phpgw_info']['login_template_set']);
+
+ $responsive_css =
"{$webserver_url}/phpgwapi/templates/pure/css/pure-min.css";
+ $responsive_grid_css =
"{$webserver_url}/phpgwapi/templates/pure/css/grids-responsive-min.css";
+ $responsive_grid_old_ie_css =
"{$webserver_url}/phpgwapi/templates/pure/css/grids-responsive-old-ie-min.css";
+
+
if(
is_file("{$GLOBALS['phpgw_info']['server']['template_dir']}/css/base.css") )
{
$base_css =
"{$webserver_url}/phpgwapi/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/css/base.css";
@@ -559,6 +565,9 @@
$flag_en =
"{$webserver_url}/phpgwapi/templates/base/images/flag_en.gif";
+ $this->tmpl->set_var('responsive_css', $responsive_css);
+ $this->tmpl->set_var('responsive_grid_css',
$responsive_grid_css);
+ $this->tmpl->set_var('responsive_grid_old_ie_css',
$responsive_grid_old_ie_css);
$this->tmpl->set_var('system_css', $system_css);
$this->tmpl->set_var('base_css', $base_css);
$this->tmpl->set_var('login_css', $login_css);
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/_config.yml
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/_config.yml
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/_config.yml
2017-02-19 13:40:34 UTC (rev 16340)
@@ -11,7 +11,7 @@
examples:
output: true
-jqtree_version: 1.3.3
+jqtree_version: 1.3.7
# Build settings
markdown: kramdown
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/bower.json
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/bower.json
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/bower.json
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,6 +1,6 @@
{
"name": "jqTree",
- "version": "1.3.3",
+ "version": "1.3.7",
"main": [
"jqtree.css",
"jqtree-circle.png",
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/gulpfile.coffee
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/gulpfile.coffee
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/gulpfile.coffee
2017-02-19 13:40:34 UTC (rev 16340)
@@ -5,6 +5,7 @@
exec = require('child_process').exec
fs = require 'fs'
header = require 'gulp-header'
+rename = require 'gulp-rename'
sass = require 'gulp-sass'
pkg = require './package.json'
@@ -24,8 +25,9 @@
.pipe gulp.dest('./lib')
gulp.task 'build_test', ->
- gulp.src './src/test.js'
+ gulp.src './src_test/test.js'
.pipe coffeeify()
+ .pipe rename('test_build.js')
.pipe gulp.dest('./test')
gulp.task 'jekyll', (cb) ->
Modified:
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/jqtree.jquery.json
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/jqtree.jquery.json
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/jqtree.jquery.json
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,6 +1,6 @@
{
"name": "jqtree",
- "version": "1.3.3",
+ "version": "1.3.7",
"title": "jqTree",
"description": "JqTree is a jQuery widget for displaying a tree structure
in html. It supports json data, loading via ajax and drag-and-drop",
"keywords": [
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/karma.conf.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/karma.conf.js
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/karma.conf.js
2017-02-19 13:40:34 UTC (rev 16340)
@@ -13,7 +13,7 @@
// list of files / patterns to load in the browser
files: [
- 'src/karma-test.js',
+ 'src_test/karma-test.js',
'static/bower_components/json3/lib/json3.js'
],
@@ -22,7 +22,7 @@
],
preprocessors: {
- 'src/karma-test.js': ['browserify']
+ 'src_test/karma-test.js': ['browserify']
},
browserify: {
Modified:
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/node_element.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/node_element.js
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/node_element.js
2017-02-19 13:40:34 UTC (rev 16340)
@@ -90,7 +90,7 @@
$span = _this.getSpan();
$span.attr('aria-expanded', 'true');
if (on_finished) {
- on_finished();
+ on_finished(_this.node);
}
return _this.tree_widget._triggerEvent('tree.open', {
node: _this.node
Modified:
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/scroll_handler.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/scroll_handler.js
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/scroll_handler.js
2017-02-19 13:40:34 UTC (rev 16340)
@@ -7,7 +7,6 @@
this.tree_widget = tree_widget;
this.previous_top = -1;
this.is_initialized = false;
- this._initScrollParent();
}
ScrollHandler.prototype._initScrollParent = function() {
Modified:
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,4 +1,4 @@
-var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer,
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler,
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler,
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler,
node_module, ref, util_module,
+var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer,
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler,
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler,
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler,
isFunction, node_module, ref, util_module,
extend = function(child, parent) { for (var key in parent) { if
(hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() {
this.constructor = child; } ctor.prototype = parent.prototype; child.prototype
= new ctor(); child.__super__ = parent.prototype; return child; },
hasProp = {}.hasOwnProperty;
@@ -28,6 +28,8 @@
util_module = require('./util');
+isFunction = util_module.isFunction;
+
ref = require('./node_element'), BorderDropHint = ref.BorderDropHint,
FolderElement = ref.FolderElement, GhostDropHint = ref.GhostDropHint,
NodeElement = ref.NodeElement;
DragAndDropHandler = drag_and_drop_handler.DragAndDropHandler, DragElement =
drag_and_drop_handler.DragElement, HitAreasGenerator =
drag_and_drop_handler.HitAreasGenerator;
@@ -376,15 +378,33 @@
return this.tree.getNodeByCallback(callback);
};
- JqTreeWidget.prototype.openNode = function(node, slide) {
- if (slide == null) {
- slide = null;
+ JqTreeWidget.prototype.openNode = function(node, slide_param,
on_finished_param) {
+ var on_finished, parseParams, ref1, slide;
+ if (slide_param == null) {
+ slide_param = null;
}
+ if (on_finished_param == null) {
+ on_finished_param = null;
+ }
+ parseParams = (function(_this) {
+ return function() {
+ var on_finished, slide;
+ if (isFunction(slide_param)) {
+ on_finished = slide_param;
+ slide = null;
+ } else {
+ slide = slide_param;
+ on_finished = on_finished_param;
+ }
+ if (slide === null) {
+ slide = _this.options.slide;
+ }
+ return [slide, on_finished];
+ };
+ })(this);
+ ref1 = parseParams(), slide = ref1[0], on_finished = ref1[1];
if (node) {
- if (slide === null) {
- slide = this.options.slide;
- }
- this._openNode(node, slide);
+ this._openNode(node, slide, on_finished);
}
return this.element;
};
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/util.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/util.js
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/util.js
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,4 +1,4 @@
-var _indexOf, getBoolString, html_escape, indexOf, isInt;
+var _indexOf, getBoolString, html_escape, indexOf, isFunction, isInt;
_indexOf = function(array, item) {
var i, j, len, value;
@@ -23,6 +23,10 @@
return typeof n === 'number' && n % 1 === 0;
};
+isFunction = function(v) {
+ return typeof v === 'function';
+};
+
html_escape = function(string) {
return ('' + string).replace(/&/g, '&').replace(/</g,
'<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g,
''').replace(/\//g, '/');
};
@@ -40,5 +44,6 @@
getBoolString: getBoolString,
html_escape: html_escape,
indexOf: indexOf,
- isInt: isInt
+ isInt: isInt,
+ isFunction: isFunction
};
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/version.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/version.js
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/version.js
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1 +1 @@
-module.exports = '1.3.6';
+module.exports = '1.3.7';
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/package.json
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/package.json
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/package.json
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,6 +1,6 @@
{
"name": "jqtree",
- "version": "1.3.3",
+ "version": "1.3.7",
"description": "Tree widget for jQuery",
"keywords": [
"jquery-plugin",
@@ -13,35 +13,39 @@
"url": "https://github.com/mbraak/jqtree";
},
"scripts": {
- "test": "karma start --browsers Chrome --single-run && coffeelint src"
+ "test": "karma start --browsers Chrome --single-run && coffeelint src",
+ "build": "gulp",
+ "watch": "gulp watch",
+ "karma": "karma start --browsers Chrome"
},
"dependencies": {
"jquery": ">=1.9"
},
"devDependencies": {
- "browserify": "^13.0.1",
- "coffee-script": "1.10.0",
- "coffeeify": "^2.0.1",
- "connect": "^3.4.1",
- "coveralls": "^2.11.9",
+ "browserify": "^13.3.0",
+ "coffee-script": "^1.12.2",
+ "coffeeify": "^2.1.0",
+ "connect": "^3.5.0",
+ "coveralls": "^2.11.15",
"gulp": "^3.9.1",
- "gulp-coffee": "2.3.2",
+ "gulp-coffee": "^2.3.3",
"gulp-coffeeify": "0.1.8",
"gulp-coffeelint": "^0.6.0",
- "gulp-header": "^1.8.2",
- "gulp-sass": "^2.3.1",
+ "gulp-header": "^1.8.8",
+ "gulp-rename": "^1.2.2",
+ "gulp-sass": "^3.1.0",
"ie-version": "^0.1.0",
- "jquery-mockjax": "^2.1.1",
- "karma": "^0.13.22",
- "karma-browserify": "^5.0.5",
- "karma-chrome-launcher": "^1.0.1",
- "karma-cli": "^1.0.0",
+ "jquery-mockjax": "^2.2.1",
+ "karma": "^1.3.0",
+ "karma-browserify": "^5.1.0",
+ "karma-chrome-launcher": "^2.0.0",
+ "karma-cli": "^1.0.1",
"karma-firefox-launcher": "^1.0.0",
- "karma-phantomjs-launcher": "^1.0.0",
- "karma-qunit": "^1.0.0",
- "phantomjs-prebuilt": "^2.1.7",
- "qunitjs": "^1.23.0",
- "serve-static": "^1.10.2",
- "watchify": "^3.7.0"
+ "karma-phantomjs-launcher": "^1.0.2",
+ "karma-qunit": "^1.2.1",
+ "phantomjs-prebuilt": "^2.1.14",
+ "qunitjs": "^2.1.1",
+ "serve-static": "^1.11.1",
+ "watchify": "^3.8.0"
}
}
Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,5 +1,5 @@
/*
-JqTree 1.3.6
+JqTree 1.3.7
Copyright 2015 Marco Braak
@@ -1726,7 +1726,7 @@
$span = _this.getSpan();
$span.attr('aria-expanded', 'true');
if (on_finished) {
- on_finished();
+ on_finished(_this.node);
}
return _this.tree_widget._triggerEvent('tree.open', {
node: _this.node
@@ -2111,7 +2111,6 @@
this.tree_widget = tree_widget;
this.previous_top = -1;
this.is_initialized = false;
- this._initScrollParent();
}
ScrollHandler.prototype._initScrollParent = function() {
@@ -2482,7 +2481,7 @@
module.exports = SimpleWidget;
},{}],11:[function(require,module,exports){
-var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer,
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler,
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler,
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler,
node_module, ref, util_module,
+var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer,
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler,
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler,
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler,
isFunction, node_module, ref, util_module,
extend = function(child, parent) { for (var key in parent) { if
(hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() {
this.constructor = child; } ctor.prototype = parent.prototype; child.prototype
= new ctor(); child.__super__ = parent.prototype; return child; },
hasProp = {}.hasOwnProperty;
@@ -2512,6 +2511,8 @@
util_module = require('./util');
+isFunction = util_module.isFunction;
+
ref = require('./node_element'), BorderDropHint = ref.BorderDropHint,
FolderElement = ref.FolderElement, GhostDropHint = ref.GhostDropHint,
NodeElement = ref.NodeElement;
DragAndDropHandler = drag_and_drop_handler.DragAndDropHandler, DragElement =
drag_and_drop_handler.DragElement, HitAreasGenerator =
drag_and_drop_handler.HitAreasGenerator;
@@ -2860,15 +2861,33 @@
return this.tree.getNodeByCallback(callback);
};
- JqTreeWidget.prototype.openNode = function(node, slide) {
- if (slide == null) {
- slide = null;
+ JqTreeWidget.prototype.openNode = function(node, slide_param,
on_finished_param) {
+ var on_finished, parseParams, ref1, slide;
+ if (slide_param == null) {
+ slide_param = null;
}
+ if (on_finished_param == null) {
+ on_finished_param = null;
+ }
+ parseParams = (function(_this) {
+ return function() {
+ var on_finished, slide;
+ if (isFunction(slide_param)) {
+ on_finished = slide_param;
+ slide = null;
+ } else {
+ slide = slide_param;
+ on_finished = on_finished_param;
+ }
+ if (slide === null) {
+ slide = _this.options.slide;
+ }
+ return [slide, on_finished];
+ };
+ })(this);
+ ref1 = parseParams(), slide = ref1[0], on_finished = ref1[1];
if (node) {
- if (slide === null) {
- slide = this.options.slide;
- }
- this._openNode(node, slide);
+ this._openNode(node, slide, on_finished);
}
return this.element;
};
@@ -3565,7 +3584,7 @@
SimpleWidget.register(JqTreeWidget, 'tree');
},{"./drag_and_drop_handler":1,"./elements_renderer":2,"./key_handler":3,"./mouse.widget":4,"./node":5,"./node_element":6,"./save_state_handler":7,"./scroll_handler":8,"./select_node_handler":9,"./simple.widget":10,"./util":12,"./version":13}],12:[function(require,module,exports){
-var _indexOf, getBoolString, html_escape, indexOf, isInt;
+var _indexOf, getBoolString, html_escape, indexOf, isFunction, isInt;
_indexOf = function(array, item) {
var i, j, len, value;
@@ -3590,6 +3609,10 @@
return typeof n === 'number' && n % 1 === 0;
};
+isFunction = function(v) {
+ return typeof v === 'function';
+};
+
html_escape = function(string) {
return ('' + string).replace(/&/g, '&').replace(/</g,
'<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g,
''').replace(/\//g, '/');
};
@@ -3607,10 +3630,11 @@
getBoolString: getBoolString,
html_escape: html_escape,
indexOf: indexOf,
- isInt: isInt
+ isInt: isInt,
+ isFunction: isFunction
};
},{}],13:[function(require,module,exports){
-module.exports = '1.3.6';
+module.exports = '1.3.7';
},{}]},{},[11]);
Deleted: branches/Version-2_0-branch/phpgwapi/templates/base/css/ie6.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/css/ie6.css
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/css/ie6.css
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,16 +0,0 @@
-/* CSS Document */
-
-div#toolbar-box {
- float: left;
- width: 100%;
-}
-
-#minwidth, #minwidth-body {width:expression(document.body.clientWidth <= 960?
"960px": "auto"); }
-
-#content-box {
- float: left;
-}
-
-input { border-width:
expression(this.type=="radio"?'0px':this.type=="checkbox"?'0px':'1px'); }
-
-
Deleted: branches/Version-2_0-branch/phpgwapi/templates/base/css/ie7.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/css/ie7.css
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/css/ie7.css
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,19 +0,0 @@
-input { border-width:
expression(this.type=="radio"?'0px':this.type=="checkbox"?'0px':'1px'); }
-
-div#toolbar-box {
- height: 65px;
-}
-
-#toolbar-box div.m {
-height: 50px;
-
-}
-
-.button2-left .page a, .button2-right .page a, .button2-left .page span,
.button2-right .page span, .button2-left .blank a, .button2-right .blank a,
.button2-left .blank span, .button2-right .blank span{
- float: left;
-}
-
- #sbox-window {
-margin:30%;
-}
-
Deleted:
branches/Version-2_0-branch/phpgwapi/templates/base/css/joomla_general.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/css/joomla_general.css
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/css/joomla_general.css
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,596 +0,0 @@
-/**
-* @version $Id: general.css 14401 2010-01-26 14:10:00Z louis $
-* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights
reserved.
-* @license GNU/GPL, see LICENSE.php
-* Joomla! is free software. This version may have been modified pursuant
-* to the GNU General Public License, and as distributed it includes or
-* is derivative of works licensed under the GNU General Public License or
-* other free or open source software licenses.
-* See COPYRIGHT.php for copyright notices and details.
-*/
-
-/**
- * Joomla! 1.5 Admin template main css file
- *
- * @author Andy Miller <address@hidden>
- * @package Joomla
- * @since 1.5
- * @version 1.0
- */
-
-/* -- General styles ------------------------------ */
-
-body {
- margin: 10px; padding: 0;
- background: #fff;
- padding-bottom: 1px;
-
- font-size: 11px;
-}
-
-body, td, th { font-family: Arial, Helvetica, sans-serif; }
-
-html, body { height: 95%; }
-
-#minwidth { min-width: 960px; }
-
-.clr { clear: both; overflow:hidden; height: 0; }
-
-a, img { padding: 0; margin: 0; }
-
-img { border: 0 none; }
-
-form { margin: 0; padding: 0; }
-
-h1 {
- margin: 0; padding-bottom: 8px;
- color: #0B55C4; font-size: 20px; font-weight: bold;
-}
-
-h3 {
- font-size: 13px;
-}
-
-a:link { color: #0B55C4; text-decoration: none; }
-a:visited { color: #0B55C4; text-decoration: none; }
-a:hover { text-decoration: underline; }
-
-fieldset {
- margin-bottom: 10px;
- border: 1px #ccc solid;
- padding: 5px;
- text-align: left;
-}
-
-fieldset p { margin: 10px 0px; }
-
-legend {
- color: #0B55C4;
- font-size: 12px;
- font-weight: bold;
-}
-
-input, select { font-size: 10px; border: 1px solid silver; }
-textarea { font-size: 11px; border: 1px solid silver; }
-button { font-size: 10px; }
-
-input.disabled { background-color: #F0F0F0; }
-
-input.button { cursor: pointer; }
-
-input:focus,
-select:focus,
-textarea:focus { background-color: #ffd }
-
-/* -- overall styles ------------------------------ */
-
-#border-top.h_green { background: url(../images/j_header_middle.png)
repeat-x; }
-#border-top.h_green div { background: url(../images/j_header_right.png)
100% 0 no-repeat; }
-#border-top.h_green div div { background: url(../images/j_header_left.png)
no-repeat; height: 54px; }
-
-#border-top.h_teal { background: url(../images/j_header_middle.png)
repeat-x; }
-#border-top.h_teal div { background: url(../images/j_header_right.png)
100% 0 no-repeat; }
-#border-top.h_teal div div { background: url(../images/j_header_left.png)
no-repeat; height: 54px; }
-
-#border-top.h_cherry { background: url(../images/j_header_middle.png)
repeat-x; }
-#border-top.h_cherry div { background: url(../images/j_header_right.png)
100% 0 no-repeat; }
-#border-top.h_cherry div div { background: url(../images/j_header_left.png)
no-repeat; height: 54px; }
-
-#border-top .title {
- font-size: 22px; font-weight: bold; color: #fff; line-height: 44px;
- padding-left: 180px;
-}
-
-#border-top .version {
- display: block; float: right;
- color: #fff;
- padding: 25px 5px 0 0;
-}
-
-#border-bottom { background:
url(../images/j_bottom.png) repeat-x; }
-#border-bottom div { background: url(../images/j_corner_br.png)
100% 0 no-repeat; }
-#border-bottom div div { background: url(../images/j_corner_bl.png)
no-repeat; height: 11px; }
-
-#footer .copyright { margin: 10px; text-align: center; }
-
-#header-box { border: 1px solid #ccc; background: #f0f0f0; }
-
-#content-box {
- border-left: 1px solid #ccc;
- border-right: 1px solid #ccc;
-}
-
-#content-box .padding { padding: 10px 10px 0 10px; }
-
-#toolbar-box { background: #fbfbfb; margin-bottom: 10px; }
-
-#submenu-box { background: #f6f6f6; margin-bottom: 10px; }
-#submenu-box .padding { padding: 0px;}
-
-
-/* -- status layout */
-#module-status { float: right; }
-#module-status span { display: block; float: left; line-height: 16px; padding:
4px 10px 0 22px; margin-bottom: 5px; }
-
-#module-status { background: url(../images/mini_icon.png) 3px 5px no-repeat; }
-.legacy-mode{ color: #c00;}
-#module-status .preview { background:
url(../images/menu/icon-16-media.png) 3px 3px no-repeat; }
-#module-status .unread-messages,
-#module-status .no-unread-messages { background:
url(../images/menu/icon-16-messages.png) 3px 3px no-repeat; }
-#module-status .unread-messages a { font-weight: bold; }
-#module-status .loggedin-users { background:
url(../images/menu/icon-16-user.png) 3px 3px no-repeat; }
-#module-status .logout { background:
url(../images/menu/icon-16-logout.png) 3px 3px no-repeat; }
-
-/* -- various styles -- */
-span.note {
- display: block;
- background: #ffd;
- padding: 5px;
- color: #666;
-}
-
-/** overlib **/
-
-.ol-foreground {
- background-color: #ffe;
-}
-
-.ol-background {
- background-color: #6db03c;
-}
-
-.ol-textfont {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: #666;
-}
-
-.ol-captionfont {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #fff;
- font-weight: bold;
-}
-.ol-captionfont a {
- color: #0b5fc6;
- text-decoration: none;
-}
-
-.ol-closefont {}
-
-/** toolbar **/
-
-div.header {
- font-size: 22px; font-weight: bold; color: #0B55C4; line-height: 48px;
- padding-left: 55px;
- background-repeat: no-repeat;
- margin-left: 10px;
-}
-
-div.header span { color: #666; }
-
-div.configuration {
- font-size: 14px; font-weight: bold; color: #0B55C4; line-height: 16px;
- padding-left: 30px;
- margin-left: 10px;
- background-image: url(../images/menu/icon-16-config.png);
- background-repeat: no-repeat;
-}
-
-div.toolbar { float: right; text-align: right; padding: 0; }
-
-table.toolbar { border-collapse: collapse; padding:
0; margin: 0; }
-table.toolbar td { padding: 1px 1px 1px 4px;
text-align: center; color: #666; height: 48px; }
-table.toolbar td.spacer { width: 10px; }
-table.toolbar td.divider { border-right: 1px solid #eee; width: 5px; }
-
-table.toolbar span { float: none; width: 32px; height: 32px; margin: 0 auto;
display: block; }
-
-table.toolbar a {
- display: block; float: left;
- white-space: nowrap;
- border: 1px solid #fbfbfb;
- padding: 1px 5px;
- cursor: pointer;
-}
-
-table.toolbar a:hover {
- border-left: 1px solid #eee;
- border-top: 1px solid #eee;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- text-decoration: none;
- color: #0B55C4;
-}
-
-/** for massmail component **/
-td#mm_pane { width: 90%; }
-input#mm_subject { width: 200px; }
-textarea#mm_message { width: 100%; }
-
-/* pane-sliders */
-.pane-sliders .title {
- margin: 0;
- padding: 2px;
- color: #666;
- cursor: pointer;
-}
-
-.pane-sliders .panel { border: 1px solid #ccc; margin-bottom: 3px;}
-
-.pane-sliders .panel h3 { background: #f6f6f6; color: #666}
-
-.pane-sliders .content { background: #f6f6f6; }
-
-.pane-sliders .adminlist { border: 0 none; }
-.pane-sliders .adminlist td { border: 0 none; }
-
-.jpane-toggler span { background: transparent url(../images/j_arrow.png)
5px 50% no-repeat; padding-left: 20px;}
-.jpane-toggler-down span { background: transparent
url(../images/j_arrow_down.png) 5px 50% no-repeat; padding-left: 20px;}
-
-.jpane-toggler-down { border-bottom: 1px solid #ccc; }
-
-/* tabs */
-
-dl.tabs {
- float: left;
- margin: 10px 0 -1px 0;
- z-index: 50;
-}
-
-dl.tabs dt {
- float: left;
- padding: 4px 10px;
- border-left: 1px solid #ccc;
- border-right: 1px solid #ccc;
- border-top: 1px solid #ccc;
- margin-left: 3px;
- background: #f0f0f0;
- color: #666;
-}
-
-dl.tabs dt.open {
- background: #F9F9F9;
- border-bottom: 1px solid #F9F9F9;
- z-index: 100;
- color: #000;
-}
-
-div.current {
- clear: both;
- border: 1px solid #ccc;
- padding: 10px 10px;
-}
-
-div.current dd {
- padding: 0;
- margin: 0;
-}
-/** cpanel settings **/
-
-#cpanel div.icon {
- text-align: center;
- margin-right: 5px;
- float: left;
- margin-bottom: 5px;
-}
-
-#cpanel div.icon a {
- display: block;
- float: left;
- border: 1px solid #f0f0f0;
- height: 97px;
- width: 108px;
- color: #666;
- vertical-align: middle;
- text-decoration: none;
-}
-
-#cpanel div.icon a:hover {
- border-left: 1px solid #eee;
- border-top: 1px solid #eee;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- background: #f9f9f9;
- color: #0B55C4;
-}
-
-#cpanel img { padding: 10px 0; margin: 0 auto; }
-#cpanel span { display: block; text-align: center; }
-
-/* standard form style table */
-div.col { float: left; }
-div.width-45 { width: 45%; }
-div.width-55 { width: 55%; }
-div.width-50 { width: 50%; }
-div.width-70 { width: 70%; }
-div.width-30 { width: 30%; }
-div.width-60 { width: 60%; }
-div.width-40 { width: 40%; }
-
-table.admintable td { padding: 3px; }
-table.admintable td.key,
-table.admintable td.paramlist_key {
- background-color: #f6f6f6;
- text-align: right;
- width: 140px;
- color: #666;
- font-weight: bold;
- border-bottom: 1px solid #e9e9e9;
- border-right: 1px solid #e9e9e9;
-}
-
-table.paramlist td.paramlist_description {
- background-color: #f6f6f6;
- text-align: left;
- width: 170px;
- color: #333;
- font-weight: normal;
- border-bottom: 1px solid #e9e9e9;
- border-right: 1px solid #e9e9e9;
-}
-
-table.admintable td.key.vtop { vertical-align: top; }
-
-table.adminform {
- background-color: #f9f9f9;
- border: solid 1px #d5d5d5;
- width: 100%;
- border-collapse: collapse;
- margin: 8px 0 10px 0;
- margin-bottom: 15px;
- width: 100%;
-}
-table.adminform.nospace { margin-bottom: 0; }
-table.adminform tr.row0 { background-color: #f9f9f9; }
-table.adminform tr.row1 { background-color: #eeeeee; }
-
-table.adminform th {
- font-size: 11px;
- padding: 6px 2px 4px 4px;
- text-align: left;
- height: 25px;
- color: #000;
- background-repeat: repeat;
-}
-table.adminform td { padding: 3px; text-align: left; }
-
-table.adminform td.filter{
- text-align: left;
-}
-
-table.adminform td.helpMenu{
- text-align: right;
-}
-
-
-fieldset.adminform { border: 1px solid #ccc; margin: 0 10px 10px 10px; }
-
-/** Table styles **/
-
-table.adminlist {
- width: 100%;
- border-spacing: 1px;
- background-color: #e7e7e7;
- color: #666;
-}
-
-table.adminlist td,
-table.adminlist th { padding: 4px; }
-
-table.adminlist thead th {
- text-align: center;
- background: #f0f0f0;
- color: #666;
- border-bottom: 1px solid #999;
- border-left: 1px solid #fff;
-}
-
-table.adminlist thead a:hover { text-decoration: none; }
-
-table.adminlist thead th img { vertical-align: middle; }
-
-table.adminlist tbody th { font-weight: bold; }
-
-table.adminlist tbody tr { background-color: #fff;
text-align: left; }
-table.adminlist tbody tr.row1 { background: #f9f9f9; border-top: 1px solid
#fff; }
-
-table.adminlist tbody tr.row0:hover td,
-table.adminlist tbody tr.row1:hover td { background-color: #ffd ; }
-
-table.adminlist tbody tr td { height: 25px; background: #fff; border:
1px solid #fff; }
-table.adminlist tbody tr.row1 td { background: #f9f9f9; border-top: 1px solid
#FFF; }
-
-table.adminlist tfoot tr { text-align: center; color: #333; }
-table.adminlist tfoot td,
-table.adminlist tfoot th { background-color: #f3f3f3; border-top: 1px solid
#999; text-align: center; }
-
-table.adminlist td.order { text-align: center; white-space:
nowrap; }
-table.adminlist td.order span { float: left; display: block; width: 20px;
text-align: center; }
-
-table.adminlist .pagination { display:table; padding:0; margin:0 auto;
}
-
-.pagination div.limit {
- float: left;
- height: 22px;
- line-height: 22px;
- margin: 0 10px;
-}
-
-/** stu nicholls solution for centering divs **/
-.container {clear:both; text-decoration:none;}
-* html .container {display:inline-block;}
-
-/** table solution for global config **/
-table.noshow { width: 100%; border-collapse: collapse;
padding: 0; margin: 0; }
-table.noshow tr { vertical-align: top; }
-table.noshow td { }
-table.noshow fieldset { margin: 15px 7px 7px 7px; }
-
-#editor-xtd-buttons { padding: 5px; }
-
-/* -- buttons -> STILL NEED CLEANUP*/
-
-.button1,
-.button1 div{
- height: 1%;
- float: right;
-}
-
-.button2-left,
-.button2-right,
-.button2-left div,
-.button2-right div {
- float: left;
-}
-
-.button1 { background: url(../images/j_button1_left.png) no-repeat;
white-space: nowrap; padding-left: 10px; margin-left: 5px;}
-
-.button1 .next { background: url(../images/j_button1_next.png) 100% 0
no-repeat; }
-
-.button1 a {
- display: block;
- height: 26px;
- float: left;
- line-height: 26px;
- font-size: 12px;
- font-weight: bold;
- color: #333;
- cursor: pointer;
- padding: 0 30px 0 6px;
-}
-
-.button1 a:hover { text-decoration: none; color: #0B55C4; }
-
-.button2-left a,
-.button2-right a,
-.button2-left span,
-.button2-right span {
- display: block;
- height: 22px;
- float: left;
- line-height: 22px;
- font-size: 11px;
- color: #333;
- cursor: pointer;
-}
-
-.button2-left span,
-.button2-right span { cursor: default; color: #999; }
-
-.button2-left .page a,
-.button2-right .page a,
-.button2-left .page span,
-.button2-right .page span,
-.button2-left .blank a,
-.button2-right .blank a,
-.button2-left .blank span,
-.button2-right .blank span { padding: 0 6px; }
-
-.page span,
-.blank span {
- color: #000;
- font-weight: bold;
-}
-
-.button2-left a:hover,
-.button2-right a:hover { text-decoration: none; color: #0B55C4; }
-
-.button2-left a,
-.button2-left span { padding: 0 24px 0 6px; }
-
-.button2-right a,
-.button2-right span { padding: 0 6px 0 24px; }
-
-.button2-left { background: url(../images/j_button2_left.png) no-repeat;
float: left; margin-left: 5px; }
-
-.button2-right { background: url(../images/j_button2_right.png) 100% 0
no-repeat; float: left; margin-left: 5px; }
-
-.button2-right .prev { background: url(../images/j_button2_prev.png)
no-repeat; }
-
-.button2-right.off .prev { background: url(../images/j_button2_prev_off.png)
no-repeat; }
-
-.button2-right .start { background: url(../images/j_button2_first.png)
no-repeat; }
-
-.button2-right.off .start { background: url(../images/j_button2_first_off.png)
no-repeat; }
-
-.button2-left .page,
-.button2-left .blank { background: url(../images/j_button2_right_cap.png) 100%
0 no-repeat; }
-
-.button2-left .next { background: url(../images/j_button2_next.png) 100% 0
no-repeat; }
-
-.button2-left.off .next { background: url(../images/j_button2_next_off.png)
100% 0 no-repeat; }
-
-.button2-left .end { background: url(../images/j_button2_last.png) 100% 0
no-repeat; }
-
-.button2-left.off .end { background: url(../images/j_button2_last_off.png)
100% 0 no-repeat; }
-
-.button2-left .image { background:
url(../images/j_button2_image.png) 100% 0 no-repeat; }
-.button2-left .readmore { background:
url(../images/j_button2_readmore.png) 100% 0 no-repeat; }
-.button2-left .pagebreak { background:
url(../images/j_button2_pagebreak.png) 100% 0 no-repeat; }
-.button2-left .blank { background:
url(../images/j_button2_blank.png) 100% 0 no-repeat; }
-
-/* Tooltips */
-.tool-tip {
- float: left;
- background: #ffc;
- border: 1px solid #D4D5AA;
- padding: 5px;
- max-width: 200px;
- z-index: 50;
-}
-
-.tool-title {
- padding: 0;
- margin: 0;
- font-size: 100%;
- font-weight: bold;
- margin-top: -15px;
- padding-top: 15px;
- padding-bottom: 5px;
- background: url(../images/selector-arrow.png) no-repeat;
-}
-
-.tool-text {
- font-size: 100%;
- margin: 0;
-}
-
-/* Calendar */
-a img.calendar {
- width: 16px;
- height: 16px;
- margin-left: 3px;
- background: url(../images/calendar.png) no-repeat;
- cursor: pointer;
- vertical-align: middle;
-}
-
-/* System Standard Messages */
-#system-message dd.message ul { background: #C3D2E5
url(../images/notice-info.png) 4px center no-repeat;}
-
-/* System Error Messages */
-#system-message dd.error ul { color: #c00; background: #E6C0C0
url(../images/notice-alert.png) 4px top no-repeat; border-top: 3px solid
#DE7A7B; border-bottom: 3px solid #DE7A7B;}
-
-/* System Notice Messages */
-#system-message dd.notice ul { color: #c00; background: #EFE7B8
url(../images/notice-note.png) 4px top no-repeat; border-top: 3px solid
#F0DC7E; border-bottom: 3px solid #F0DC7E;}
Modified: branches/Version-2_0-branch/phpgwapi/templates/base/css/login.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/css/login.css
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/css/login.css
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,191 +1,291 @@
-/**
-* @version $Id: login.css 14401 2010-01-26 14:10:00Z louis $
-* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights
reserved.
-* @license GNU/GPL, see LICENSE.php
-* Joomla! is free software. This version may have been modified pursuant
-* to the GNU General Public License, and as distributed it includes or
-* is derivative of works licensed under the GNU General Public License or
-* other free or open source software licenses.
-* See COPYRIGHT.php for copyright notices and details.
-*/
+* {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
-/**
- * Adopted from the Joomla! 1.5 Admin template main css file
- *
- * @author Andy Miller <address@hidden>
- * @package Joomla
- * @since 1.5
- * @version 1.0
+/*
+ * -- BASE STYLES --
+ * Most of these are inherited from Base, but I want to change a few.
*/
+body {
+ line-height: 1.7em;
+ color: #7f8c8d;
+ font-size: 13px;
+}
-/* -- Imported styles ----------------------------- */
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+label {
+ color: #34495e;
+}
address@hidden url("joomla_general.css");
+.pure-img-responsive {
+ max-width: 100%;
+ height: auto;
+}
-/* -- Specific styles ----------------------------- */
+/*
+ * -- LAYOUT STYLES --
+ * These are some useful classes which I will need
+ */
+.l-box {
+ padding: 1em;
+}
-form { margin: 0px; padding: 0px; }
-form .inputbox { width: 120px; margin-left: 10px; }
-form br { display: none; }
-.login { margin: 0 auto; width: 500px; margin-bottom: 100px; }
+.l-box-lrg {
+ padding: 2em;
+ border-bottom: 1px solid rgba(0,0,0,0.1);
+}
-h1 {
- margin: 15px 0;
+.is-center {
+ text-align: center;
}
-p {
- margin: 0;
- padding: 0;
- margin-bottom: 10px;
+
+
+/*
+ * -- PURE FORM STYLES --
+ * Style the form inputs and labels
+ */
+.pure-form label {
+ margin: 1em 0 0;
+ font-weight: bold;
+ font-size: 100%;
}
-#lock {
- background: url(../images/j_login_lock.jpg) 50% 0 no-repeat;
- width: 150px;
- height: 137px;
+.pure-form input[type] {
+ border: 2px solid #ddd;
+ box-shadow: none;
+ font-size: 100%;
+ width: 100%;
+ margin-bottom: 1em;
}
-#content-box .m {
- padding: 10px;
+/*
+ * -- PURE BUTTON STYLES --
+ * I want my pure-button elements to look a little different
+ */
+.pure-button {
+ background-color: #1f8dd6;
+ color: white;
+ padding: 0.5em 2em;
+ border-radius: 5px;
}
-#content-box .padding {
- padding: 30px 0;
+a.pure-button-primary {
+ background: white;
+ color: #1f8dd6;
+ border-radius: 5px;
+ font-size: 120%;
}
-#section-box { float: right; width: 320px; margin-left: 10px;}
-#left-box { float: left; margin-left:10px; margin-right:10px; margin-top:
50px;}
-#right-box { float: right; margin-left:10px; margin-right:10px; margin-top:
50px;}
+/*
+ * -- MENU STYLES --
+ * I want to customize how my .pure-menu looks at the top of the page
+ */
-#section-box .m {
- padding: 5px;
+.home-menu {
+ padding: 0.5em;
+ text-align: center;
+ box-shadow: 0 1px 1px rgba(0,0,0, 0.10);
}
-#section-box .padding {
- background: none; padding: 0;
+.home-menu {
+ background: #2d3e50;
}
+.pure-menu.pure-menu-fixed {
+ /* Fixed menus normally have a border at the bottom. */
+ border-bottom: none;
+ /* I need a higher z-index here because of the scroll-over effect. */
+ z-index: 4;
+}
-.button { text-align: right; }
+.home-menu .pure-menu-heading {
+ color: white;
+ font-weight: 400;
+ font-size: 120%;
+}
-.login-form { text-align: left; width: 60%; }
-.login-form h1 { display: none; }
-.login-form p { padding: 0 1em 0 1em; }
+.home-menu .pure-menu-selected a {
+ color: white;
+}
-.login-text { text-align: left; width: 40%; float: left; }
-
-#form-login label {
- display: block;
- float: left;
- width: 120px;
- text-align: right;
- padding: 4px;
- color: #666;
- font-weight: bold;
+.home-menu a {
+ color: #6FBEF3;
}
+.home-menu li a:hover,
+.home-menu li a:focus {
+ background: none;
+ border: none;
+ color: #AECFE5;
+}
-#form-login .button_holder {
- float: left;
- padding-left: 180px;
+
+/*
+ * -- SPLASH STYLES --
+ * This is the blue top section that appears on the page.
+ */
+
+.splash-container {
+ background: #1f8dd6;
+ z-index: 1;
+ overflow: hidden;
+ /* The following styles are required for the "scroll-over" effect */
+ width: 100%;
+ height: 88%;
+ top: 0;
+ left: 0;
+ position: fixed !important;
}
-#form-login div.button1{
- float: left;
+.splash {
+ /* absolute center .splash within .splash-container */
+ width: 80%;
+ height: 50%;
+ margin: auto;
+ position: absolute;
+ top: 100px; left: 0; bottom: 0; right: 0;
+ text-align: center;
+ text-transform: uppercase;
}
-#form-login div.button1 div.next {
- float: left;
+/* This is the main heading that appears on the blue section */
+.splash-head {
+ font-size: 20px;
+ font-weight: bold;
+ color: white;
+ border: 3px solid white;
+ padding: 1em 1.6em;
+ font-weight: 100;
+ border-radius: 5px;
+ line-height: 1em;
}
-#jflanguageselection
-{
- float: right;
- margin: 15px 0px 10px 5px;
+/* This is the subheading that appears on the blue section */
+.splash-subhead {
+ color: white;
+ letter-spacing: 0.05em;
+ opacity: 0.8;
}
-/* language lists with UL (names & images) */
-#jflanguageselection ul.jflanguageselection
-{
- list-style: none;
- padding: 0;
- margin-top: 3px;
- font-weight: normal;
+/*
+ * -- CONTENT STYLES --
+ * This represents the content area (everything below the blue section)
+ */
+.content-wrapper {
+ position: absolute;
+ top: 7%;
+ width: 100%;
+ min-height: 12%;
+ z-index: 2;
+ background: white;
+
}
-#jflanguageselection ul.jflanguageselection li
-{
- background-image: none;
- padding-left: 0px;
- padding-right: 0px;
- float: left;
- margin: 1px 1px 1px 1px;
- white-space: nowrap;
- border: none;
- font-size: 0.9em;
+/* We want to give the content area some more padding */
+.content {
+ padding: 1em 1em 3em;
}
-#jflanguageselection ul.jflanguageselection li#active_language
-{
- font-weight: bold;
- font-size: 1.0em;
+/* This is the class used for the main content headers (<h2>) */
+.content-head {
+ font-weight: 400;
+ text-transform: uppercase;
+ letter-spacing: 0.1em;
+ margin: 2em 0 1em;
}
-#jflanguageselection ul.jflanguageselection li a
-{
- display: block;
+/* This is a modifier class used when the content-head is inside a ribbon */
+.content-head-ribbon {
+ color: white;
}
-#jflanguageselection ul.jflanguageselection img
-{
- border: none;
+/* This is the class used for the content sub-headers (<h3>) */
+.content-subhead {
+ color: #1f8dd6;
}
+ .content-subhead i {
+ margin-right: 7px;
+ }
-div#jflanguageselection img.langImg {
- float: left;
- border: none;
- margin-top: 3px;
+/* This is the class used for the dark-background areas. */
+.ribbon {
+ background: #2d3e50;
+ color: #aaa;
}
-div#jflanguageselection li img.langImg {
- float: left;
- border: none;
- margin: 0px 1px 0px 1px;
-}
-/** Styles for the drop down list */
-
-#jflanguageselection select.jflanguageselection
-{
- border: 1px solid #cccccc;
+/* This is the class used for the footer */
+.footer {
+ background: #111;
+ position: fixed;
+ bottom: 0;
+ width: 100%;
}
-#jflanguageselection label.jflanguageselection
+.footer a,
+.footer a:visited
{
- position:absolute;
- left:-1000px;
+ color: #7f8c8d;
}
-/** Controls Raw Display of Images **/
+/*
+ * -- TABLET (AND UP) MEDIA QUERIES --
+ * On tablets and other medium-sized devices, we want to customize some
+ * of the mobile styles.
+ */
address@hidden (min-width: 48em) {
-.rawimages {
- text-align: right;
- margin-top: 3px;
-}
-.rawimages img {
- border: none;
- margin:2px;
-}
-.rawimages span#active_language img
-{
- margin:2px;
- border: none;
-}
+ /* We increase the body font size */
+ body {
+ font-size: 16px;
+ }
-div#jflanguageselection img.langImg{ float: left; border: none; margin-top:
3px; }
-div#jflanguageselection li img.langImg{ float: left; border: none; margin: 1px
3px 0px 0px; }
+ /* We can align the menu header to the left, but float the
+ menu items to the right. */
+ .home-menu {
+ text-align: left;
+ }
+ .home-menu ul {
+ float: right;
+ }
-#jflanguageselection .opaque{
- filter:alpha(opacity=30);
+ /* We increase the height of the splash-container */
+/* .splash-container {
+ height: 500px;
+ }*/
+
+ /* We decrease the width of the .splash, since we have more width
+ to work with */
+ .splash {
+ width: 50%;
+ height: 50%;
+ }
+
+ .splash-head {
+ font-size: 250%;
+ }
+
+
+ /* We remove the border-separator assigned to .l-box-lrg */
+ .l-box-lrg {
+ border: none;
+ }
+
}
-#jflanguageselection option.opaque{
- color:graytext;
+
+/*
+ * -- DESKTOP (AND UP) MEDIA QUERIES --
+ * On desktops and other large devices, we want to over-ride some
+ * of the mobile and tablet styles.
+ */
address@hidden (min-width: 78em) {
+ /* We increase the header font size even more */
+ .splash-head {
+ font-size: 300%;
+ }
}
-
Modified: branches/Version-2_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/login.tpl
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/login.tpl
2017-02-19 13:40:34 UTC (rev 16340)
@@ -1,241 +1,207 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd";>
+<!DOCTYPE html>
<html>
-<!-- BEGIN login_form -->
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta name="author" content="{system} http://www.phpgroupware.no";>
- <meta name="description" content="{system} login screen, working
environment powered by phpGroupWare">
- <meta name="keywords" content="{system} login screen, phpgroupware,
groupware, groupware suite">
- <meta name="robots" content="noindex,nofollow">
-
- <title>{system} - {lang_login}</title>
+ <!-- BEGIN login_form -->
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
charset=utf-8">
+ <meta name="viewport" content="width=device-width,
initial-scale=1.0">
+ <meta name="author" content="{system}
http://savannah.nongnu.org/projects/fmsystem/";>
+ <meta name="description" content="{system} login screen,
working environment powered by Portico Estate">
+ <meta name="keywords" content="{system} login screen,
phpgroupware, groupware, groupware suite, facilities management, CAFM">
+ <meta name="robots" content="noindex,nofollow">
- <link rel="stylesheet" href="{system_css}" type="text/css">
- <link rel="stylesheet" href="{login_css}" type="text/css">
+ <title>{system} - {lang_login}</title>
- <!--[if IE 7]>
- <link href="phpgwapi/templates/base/css/ie7.css" rel="stylesheet"
type="text/css" />
- <![endif]-->
+ <link rel="stylesheet" href="{responsive_css}" type="text/css">
- <!--[if lte IE 6]>
- <link href="phpgwapi/templates/base/css/ie6.css" rel="stylesheet"
type="text/css" />
- <![endif]-->
+ <!--[if lte IE 8]>
+ <link rel="stylesheet" href="{responsive_grid_old_ie_css}"
type="text/css">
+ <![endif]-->
+ <!--[if gt IE 8]><!-->
- <link rel="stylesheet" href="{rounded_css}" type="text/css">
+ <link rel="stylesheet" href="{responsive_grid_css}"
type="text/css">
+ <!--<![endif]-->
- {onload}
+ <link rel="stylesheet" href="{system_css}" type="text/css">
+ <link rel="stylesheet" href="{login_css}" type="text/css">
- <script type="text/javascript">
- function do_login()
- {
- if(typeof(Storage)!=="undefined")
+ <link rel="stylesheet" href="{rounded_css}" type="text/css">
+
+ {onload}
+
+ <script type="text/javascript">
+ function do_login()
{
- sessionStorage.cached_menu_tree_data = '';
- sessionStorage.cached_mapping = '';
- }
- document.login.submit();
- }
+ if (typeof (Storage) !== "undefined")
+ {
+ sessionStorage.cached_menu_tree_data =
'';
+ localStorage.clear();
+ }
+ document.login.submit();
+ }
- function new_user()
- {
- var url_new_user = '{url_new_user}';
- var logindomain = '';
-
- if(document.getElementById("logindomain") != null)
+ function new_user()
{
- var logindomain =
document.getElementById("logindomain").value;
+ var url_new_user = '{url_new_user}';
+ var logindomain = '';
+
+ if (document.getElementById("logindomain") !=
null)
+ {
+ var logindomain =
document.getElementById("logindomain").value;
+ }
+
+ url_new_user += '?logindomain=' + logindomain;
+ window.open(url_new_user, '_blank');
}
-
- url_new_user += '?logindomain=' +logindomain;
- window.open(url_new_user,'_blank');
- }
- function lost_password()
- {
- var url_lost_password = '{url_lost_password}';
- var logindomain = '';
-
- if(document.getElementById("logindomain") != null)
+ function lost_password()
{
- var logindomain =
document.getElementById("logindomain").value;
+ var url_lost_password = '{url_lost_password}';
+ var logindomain = '';
+
+ if (document.getElementById("logindomain") !=
null)
+ {
+ var logindomain =
document.getElementById("logindomain").value;
+ }
+
+ url_lost_password += '&logindomain=' +
logindomain;
+ window.open(url_lost_password, '_blank');
}
-
- url_lost_password += '&logindomain=' + logindomain;
- window.open(url_lost_password,'_blank');
- }
- </script>
+ </script>
-</head>
+ </head>
-<body>
- <div id="border-top" class="h_green">
- <div>
- <div>
- <span class="title">{system}</span>
+ <body>
+
+ <div class="header">
+ <div class="home-menu pure-menu pure-menu-horizontal
pure-menu-fixed">
+ <a class="pure-menu-heading" href="">{system}
{lang_login}</a>
+
+ <ul class="pure-menu-list">
+ <li class="pure-menu-item
pure-menu-selected"><span><a class="pure-menu-link"
href="login.php?lang=no&lightbox={lightbox}"><img src="{flag_no}" alt="Norsk
(Norway)" title="Norsk (Norway)" ></a></span></li>
+ <li class="pure-menu-item
pure-menu-selected"><span><a class="pure-menu-link"
href="login.php?lang=en&lightbox={lightbox}"><img src="{flag_en}" alt="English
(United Kingdom)" title="English (United Kingdom)" ></a></span></li>
+ </ul>
</div>
</div>
- </div>
-
- <div id="content-box">
- <div class="rawimages">
- <span><a
href="login.php?lang=no&lightbox={lightbox}"><img src="{flag_no}" alt="Norsk
(Norway)" title="Norsk (Norway)" ></a></span>
- <span><a
href="login.php?lang=en&lightbox={lightbox}"><img src="{flag_en}" alt="English
(United Kingdom)" title="English (United Kingdom)" ></a></span>
- </div>
+ <div class="content-wrapper">
- <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">
- <div class="t"></div>
- </div>
- </div>
+ <div class="content">
+ <h2 class="content-head
is-center">{instruction}</h2>
- <div class="m">
- <h1>{system} {lang_login}</h1>
+ <div class="pure-g">
- <!-- BEGIN message_block -->
- <dl id="system-message">
- <dt
class="{message_class}">{lang_message}</dt>
- <dd
class="{message_class_item}">
- <ul>
- <li>{cd}</li>
- </ul>
- </dd>
- </dl>
- <!-- END message_block -->
+ <div class="l-box-lrg pure-u-1
pure-u-md-1-2">
+ <div class="l-box">
+ <!-- BEGIN
message_block -->
+ <dl id="system-message">
+ <dt
class="{message_class}">{lang_message}</dt>
+ <dd
class="{message_class_item}">
+ <ul>
+
<li>{cd}</li>
+ </ul>
+ </dd>
+ </dl>
+ <!-- END message_block
-->
- <div id="section-box">
- <div class="t">
- <div class="t">
- <div
class="t"></div>
- </div>
- </div>
-
- <div class="m">
-
- <form name="login"
method="post" action="{login_url}" {autocomplete} id="form-login" style="clear:
both;">
- <input
type="hidden" name="passwd_type" value="text">
- <!-- BEGIN
loging_block -->
- <p
id="form-login-username">
- <label
for="modlgn_username">{lang_username}</label>
- <input
type="text" value="{last_loginid}" name="login" id="modlgn_username"
{login_read_only} class="inputbox" size="15" >
- <input
type="hidden" name="skip_remote" value="{skip_remote}">
- <input
type="hidden" name="lightbox" value="{lightbox}">
- </p>
- <!-- END
loging_block -->
- <!-- BEGIN
domain_from_host -->
+ <form name="login"
method="post" action="{login_url}" {autocomplete} id="form-login"
class="pure-form pure-form-stacked">
+ <fieldset>
+ <input
type="hidden" name="passwd_type" value="text">
+ <!--
BEGIN loging_block -->
+ <div
class="pure-control-group">
+
<label for="login">{lang_username}</label>
+
<input type="text" value="{last_loginid}" name="login" id="login"
{login_read_only} required="required"/>
+
<input type="hidden" name="skip_remote" value="{skip_remote}">
+
<input type="hidden" name="lightbox" value="{lightbox}">
+ </div>
+ <!--
END loging_block -->
+ <!--
BEGIN domain_from_host -->
@{logindomain}<input type="hidden" id="logindomain" name="logindomain"
value="{logindomain}">
- <!-- END
domain_from_host -->
- <br>
- <!-- BEGIN
login_additional_info -->
- <p
id="form-login-firstname">
- <label
for="firstname">{lang_firstname}</label>
- <input
type="text" value="{firstname}" maxlength="100" name="firstname" id="firstname"
class="inputbox" size="15">
- </p>
- <p
id="form-login-lastname">
- <label
for="lastname">{lang_lastname}</label>
- <input
type="text" value="{lastname}" name="lastname" id="lastname" class="inputbox"
size="15" maxlength="100">
- </p>
+ <!--
END domain_from_host -->
+ <br>
+ <!--
BEGIN login_additional_info -->
+ <div
class="pure-control-group">
+
<label for="firstname">{lang_firstname}</label>
+
<input type="text" value="{firstname}" maxlength="100" name="firstname"
id="firstname" >
+ </div>
+ <div
class="pure-control-group">
+
<label for="lastname">{lang_lastname}</label>
+
<input type="text" value="{lastname}" name="lastname" id="lastname"
maxlength="100">
+ </div>
- <!-- END
login_additional_info -->
- <!-- BEGIN
password_block -->
- <p
id="form-login-password">
- <label
for="passwd">{lang_password}</label>
- <input
type="password" name="passwd" id="passwd" class="inputbox" size="15">
- </p>
- <!-- END
password_block -->
- <!-- BEGIN
login_check_passwd -->
- <p
id="form-login-password_confirm">
- <label
for="passwd_confirm">{lang_confirm_password}</label>
- <input
type="password" name="passwd_confirm" id="passwd_confirm" class="inputbox"
size="15"><br>
- </p>
- <!-- END
login_check_passwd -->
- <!-- BEGIN
domain_select -->
- <p
id="form-login-domain" style="clear: both;">
- <label
for="logindomain">{lang_domain}</label>
- <select
name="logindomain" id="logindomain" class="inputbox">
- <!--
BEGIN domain_option -->
- <option
value="{domain_name}" {domain_selected}>{domain_display_name}</option>
- <!--
END domain_option -->
- </select>
- </p>
- <!-- END
domain_select -->
- <!-- BEGIN
button_block -->
- <div
class="button_holder">
-
<div class="button1">
-
<div class="next">
-
<a onclick="do_login();">{lang_login}</a>
-
</div>
-
</div>
+ <!--
END login_additional_info -->
+ <!--
BEGIN password_block -->
+ <div
class="pure-control-group">
+
<label for="passwd">{lang_password}</label>
+
<input type="password" name="passwd" id="passwd" required="required"/>
</div>
+ <!--
END password_block -->
+ <!--
BEGIN login_check_passwd -->
+ <div
class="pure-control-group">
+
<label for="passwd_confirm">{lang_confirm_password}</label>
+
<input type="password" name="passwd_confirm" id="passwd_confirm"
required="required"/>
+ </div>
+ <!--
END login_check_passwd -->
+ <!--
BEGIN domain_select -->
+ <div
class="pure-control-group">
+
<label for="logindomain">{lang_domain}</label>
+
<select name="logindomain" id="logindomain">
+
<!-- BEGIN domain_option -->
+
<option value="{domain_name}"
{domain_selected}>{domain_display_name}</option>
+
<!-- END domain_option -->
+
</select>
+ </div>
+ <!--
END domain_select -->
+ <!--
BEGIN button_block -->
- <div
class="clr"></div>
- <input
type="hidden" name="submitit" value="1">
- <input
type="submit" style="border: 0; padding: 0; margin: 0; width: 0px; height:
0px;" value="{lang_login}" name="submitit_">
-
+ <div
class="pure-controls">
+
<button type="submit" class="pure-button pure-button-primary" name="submitit_"
onclick="do_login();">{lang_login}</button>
+ </div>
+ <input
type="hidden" name="submitit" value="1">
<p
class="link_group"><a
href="{return_sso_login_url}">{lang_return_sso_login}</a></p>
-
- <!-- END
button_block -->
-
+ <!--
END button_block -->
+ </fieldset>
</form>
-
- <div class="clr"></div>
</div>
- <div class="b">
- <div class="b">
- <div
class="b"></div>
- </div>
- </div>
</div>
- <p>{instruction}</p>
- <p >
- <a
href="{action_new_user}">{lang_new_user}</a>
- </p>
- </p>
- <a
href="{action_lost_password}">{lang_forgotten_password}</a>.
- </p>
+ <div class="l-box-lrg pure-u-1
pure-u-md-1-2">
+ <p>
+ <a
href="{action_new_user}">{lang_new_user}</a>
+ </p>
- <div id="lock"></div>
+ <p>
+ <a
href="{action_lost_password}">{lang_forgotten_password}</a>.
+ </p>
+ </div>
- <div class="clr"></div>
</div>
+ <div class="pure-g">
- <div class="b">
- <div class="b">
- <div class="b"></div>
+ <div class="pure-u-1 pure-u-md-1-2">
+ <div class="l-box">
+ {login_left_message}
+ </div>
</div>
+ <div class="pure-u-1 pure-u-md-1-2">
+ <div class="l-box">
+ {login_right_message}
+ </div>
+ </div>
</div>
+
</div>
+ <div class="footer l-box is-center">
<noscript>Warning! JavaScript must be enabled for
proper operation of the Administrator back-end.</noscript>
- <div class="clr"></div>
+ <p class="copyright">
+ <a
href="http://savannah.nongnu.org/projects/fmsystem/"; target="_blank">{system}
{version}</a> is Free Software released under the <a
href="http://www.gnu.org/licenses/gpl-2.0.html";>GNU/GPL License</a>.
+ </p>
+ </div>
</div>
- </div>
- <div id="border-bottom">
- <div>
- <div>
- </div>
- </div>
-</div>
-<div id="footer">
- <p class="copyright">
- <a href="http://www.porticoestate.no"; target="_blank">{system}
{version}</a> is Free Software released under the <a href=
- "http://www.gnu.org/licenses/gpl-2.0.html";>GNU/GPL
License</a>.
- </p>
-</div>
-</body>
-<!-- END login_form -->
+
+ </body>
+ <!-- END login_form -->
</html>
Modified:
branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
2017-02-19 13:40:34 UTC (rev 16340)
@@ -28,7 +28,6 @@
<!-- BEGIN username -->
<div class="pure-control-group">
- <td width="1%"></td>
{domain_select}
</div>
<div class="pure-control-group">
@@ -42,12 +41,12 @@
<div class="pure-control-group">
{missing_passwd}
<label for="password">{lang_password}</label>
- <input type="password" id="password" type="text"
placeholder="{lang_password}" name="r_reg[passwd]" value="{value_passwd}"
required>
+ <input type="password" id="password"
placeholder="{lang_password}" name="r_reg[passwd]" value="{value_passwd}"
required>
</div>
<div class="pure-control-group">
<label
for="password2">{missing_passwd_confirm}{lang_reenter_password}</label>
- <input type="password" id="password2" type="text"
placeholder="{lang_password}" name="r_reg[passwd_confirm]"
value="{value_passwd_confirm}" required oninput="check(this)">
+ <input type="password" id="password2"
placeholder="{lang_password}" name="r_reg[passwd_confirm]"
value="{value_passwd_confirm}" required oninput="check(this)">
</div>
<!-- END password -->
Modified: branches/Version-2_0-branch/registration/templates/base/user_edit.xsl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/user_edit.xsl
2017-02-19 13:31:31 UTC (rev 16339)
+++ branches/Version-2_0-branch/registration/templates/base/user_edit.xsl
2017-02-19 13:40:34 UTC (rev 16340)
@@ -10,54 +10,48 @@
<div id="edit_user_tabview">
<xsl:value-of disable-output-escaping="yes" select="tabs" />
- <form action="#" method="post" name="form">
- <div class="yui-content">
+ <form action="#" method="post" name="form" class="pure-form
pure-form-aligned">
+ <div id="tab-content">
<div id="main">
<input type="hidden" name="id" value =
"{value_id}">
</input>
- <table>
+ <fieldset>
<xsl:for-each
select="user_data">
- <tr>
- <td>
+ <div
class="pure-control-group">
+ <label>
<xsl:value-of select="text"/>
- </td>
- <td>
-
<xsl:value-of select="value"/>
- </td>
- </tr>
+ </label>
+ <xsl:value-of
select="value"/>
+ </div>
</xsl:for-each>
<xsl:call-template
name="location_form"/>
- <tr>
- <td>
+ <div class="pure-control-group">
+ <label>
<xsl:value-of
select="php:function('lang', 'approve')" />
- </td>
- <td>
- <input
type="checkbox" name="values[approve]" value="1">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'approve')"/>
+ </label>
+ <input type="checkbox"
name="values[approve]" value="1">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'approve')"/>
+ </xsl:attribute>
+ <xsl:if
test="value_approved = '1'">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
</xsl:attribute>
- <xsl:if
test="value_approved = '1'">
-
<xsl:attribute name="checked">
-
<xsl:text>checked</xsl:text>
-
</xsl:attribute>
-
</xsl:if>
- </input>
- </td>
- </tr>
- <tr>
- <td>
+ </xsl:if>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label>
<xsl:value-of
select="php:function('lang', 'process')" />
- </td>
- <td>
- <input
type="checkbox" name="values[pending_users][]" value="{value_id}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'process approved')"/>
-
</xsl:attribute>
- </input>
- </td>
- </tr>
- </table>
+ </label>
+ <input type="checkbox"
name="values[pending_users][]" value="{value_id}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="php:function('lang', 'process approved')"/>
+ </xsl:attribute>
+ </input>
+ </div>
+ </fieldset>
</div>
<div id="groups">
<h2>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16340] table: Merge 16337:16339 from trunk,
sigurdne <=