From 37e54b3d80a336bcc408821407ecfb01f223f161 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 15 Apr 2013 18:00:20 +0200
Subject: [PATCH] Qual: Update copyright files. Qual: Removed not used library.
Look: Uniformize css.
---
COPYRIGHT | 56 +--
htdocs/compta/bank/account.php | 2 +-
htdocs/compta/bank/index.php | 12 +-
htdocs/core/menus/standard/auguria_menu.php | 1 +
htdocs/core/menus/standard/eldy_menu.php | 3 +-
.../jquery/plugins/template/README.md | 346 ------------------
.../jquery/plugins/template/compile.js | 82 -----
.../jquery/plugins/template/runtime.js | 46 ---
.../includes/jquery/plugins/template/tmpl.js | 86 -----
.../jquery/plugins/template/tmpl.min.js | 1 -
htdocs/theme/amarok/style.css.php | 15 +-
htdocs/theme/auguria/style.css.php | 11 +-
htdocs/theme/bureau2crea/style.css.php | 9 +-
htdocs/theme/cameleo/style.css.php | 9 +-
htdocs/theme/eldy/style.css.php | 3 +-
15 files changed, 78 insertions(+), 604 deletions(-)
delete mode 100644 htdocs/includes/jquery/plugins/template/README.md
delete mode 100644 htdocs/includes/jquery/plugins/template/compile.js
delete mode 100644 htdocs/includes/jquery/plugins/template/runtime.js
delete mode 100644 htdocs/includes/jquery/plugins/template/tmpl.js
delete mode 100644 htdocs/includes/jquery/plugins/template/tmpl.min.js
diff --git a/COPYRIGHT b/COPYRIGHT
index d97b00721da..4272219f80b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -9,37 +9,39 @@ More information: http://www.gnu.org/licenses/gpl-3.0.txt
Dolibarr uses some external libraries released under different licences. This is compatibility summary:
-Composant Version License Compatible GPL Usage
+Composant Version License Compatible GPL Usage
----------------------------------------------------------------------------
PHP libraries:
-AdoDb-Date 0.21 Modified BSD License Yes Date convertion (not into rpm package)
-CKEditor 3.6.4 LGPL-2.1+ Yes Editor WYSIWYG
-FPDI 1.4.2 Apache Software License 2.0 Yes PDF templates management (with FPDF_TPL 1.2)
-GeoIP 2004 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package)
-NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
-OdtPHP 1.0.1 GPL-2+ Yes Library to build/edit ODT files
-PHPExcel 1.7.6 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
-PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
-TCPDF 5.9.180 LGPL-3+ Yes PDF generation
+AdoDb-Date 0.21 Modified BSD License Yes Date convertion (not into rpm package)
+CKEditor 3.6.4 LGPL-2.1+ Yes Editor WYSIWYG
+FPDI 1.4.2 Apache Software License 2.0 Yes PDF templates management (with FPDF_TPL 1.2)
+GeoIP 2004 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package)
+NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
+OdtPHP 1.0.1 GPL-2+ Yes Library to build/edit ODT files
+PHPExcel 1.7.6 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
+PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
+TCPDF 5.9.180 LGPL-3+ Yes PDF generation
JS libraries:
-jQuery 1.8.2 MIT Licence Yes JS library
-jQuery UI 1.9.1 GPL and MIT Licence Yes JS library plugin UI
-jQuery Timepicker 1.1.0 GPL and MIT Licence Yes JS library Timepicker addon for Datepicker
-jQuery Colorpicker 1.1 MIT Licence Yes JS library for color picker for a defined list of colors
-jQuery DataTables 1.9.4 BSD Yes JS library for tables output
-jQuery Flot 0.7 MIT Licence Yes JS library to build graph
-jQuery FileUpload 5.0.3 GPL and MIT Licence Yes JS library to upload files
-jQuery JCrop 0.9.8 GPL and MIT Licence Yes JS library plugin Crop (to crop images)
-jQuery jeditable 1.7.1 GPL and MIT Licence Yes JS library plugin jeditable (to edit in place)
-jQuery jNotify 1.1.00 Apache Software License 2.0 Yes JS library plugin jNotify (to use ajax popups)
-jQuery blockUI 2.43 GPL and MIT Licence Yes JS library plugin blockUI (to use ajax popups)
-jQuery jPicker 1.1.00 GPL and MIT Licence Yes JS library for color picker with not defined list of colors
-jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15)
-jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows)
-jQuery Mobile 1.3 GPL and MIT Licence Yes JS library for smartphone (not used)
-jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips
-JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports)
+jQuery 1.8.2 MIT Licence Yes JS library
+jQuery UI 1.9.1 GPL and MIT Licence Yes JS library plugin UI
+jQuery blockUI 2.43 GPL and MIT Licence Yes JS library plugin blockUI (to use ajax popups)
+jQuery Colorpicker 1.1 MIT Licence Yes JS library for color picker for a defined list of colors
+jQuery DataTables 1.9.4 BSD Yes JS library for tables output
+jQuery FileUpload 5.0.3 GPL and MIT Licence Yes JS library to upload files
+jQuery Flot 0.7 MIT Licence Yes JS library to build graph
+jQuery JCrop 0.9.8 GPL and MIT Licence Yes JS library plugin Crop (to crop images)
+jQuery jeditable 1.7.1 GPL and MIT Licence Yes JS library plugin jeditable (to edit in place)
+jQuery jNotify 1.1.00 Apache Software License 2.0 Yes JS library plugin jNotify (to use ajax popups)
+jQuery jPicker 1.1.00 GPL and MIT Licence Yes JS library for color picker with not defined list of colors
+jQuery jqueryFileTree 1.0.1 GPL and MIT Licence Yes JS library for color picker with not defined list of colors
+jQuery jquerytreeview 1.4.1 MIT Licence Yes JS library for color picker with not defined list of colors
+jQuery Layout 1.3.0 GPL and MIT Licence Yes JS library plugin Layout (RC-29.15)
+jQuery Mobile 1.3 GPL and MIT Licence Yes JS library for smartphone (not used)
+jQuery TableDnD 0.5 GPL and MIT Licence Yes JS library plugin TableDnD (to reorder table rows)
+jQuery Timepicker 1.1.0 GPL and MIT Licence Yes JS library Timepicker addon for Datepicker
+jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips
+JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports)
For licenses compatibility informations:
http://www.fsf.org/licensing/licenses/index_html
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 7830abef655..c8aff0ccb8b 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -293,7 +293,7 @@ if ($id > 0 || ! empty($ref))
//print 'nbpage='.$totalPages.' viewline='.$viewline.' limitsql='.$limitsql;
if ($limitsql > $viewline) $navig.='<a href="account.php?'.$param.'&page='.($page+1).'">'.img_previous().'</a>';
$navig.= $langs->trans("Page")." "; // ' Page ';
- $navig.='<input type="text" name="negpage" size="1" class="flat" value="'.($totalPages-$page).'">';
+ $navig.='<input type="text" name="negpage" size="1" class="noenlargeonsmartphone" value="'.($totalPages-$page).'">';
$navig.='<input type="hidden" name="paiementtype" value="'.$paiementtype.'">';
$navig.='<input type="hidden" name="req_nb" value="'.$req_nb.'">';
$navig.='<input type="hidden" name="req_desc" value="'.GETPOST("req_desc").'">';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 8948037e486..344231cea5d 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -233,20 +233,20 @@ if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'
// Total
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td><td align="right" class="liste_total">'.price($total).'</td></tr>';
-
-
print "</table>";
+print "<br>";
/*
* Boutons d'actions
*/
-print "<br><div class=\"tabsAction\">\n";
-if ($user->rights->banque->configurer) {
+
+print '<div class="tabsAction">'."\n";
+if ($user->rights->banque->configurer)
+{
print '<a class="butAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
- print '<a class="butAction" href="categ.php">'.$langs->trans("Rubriques").'</a>';
}
-print "</div>";
+print '</div>';
llxFooter();
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index d2943db0e83..d82c4889335 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -222,6 +222,7 @@ class MenuManager
if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).'">';
if ($relurl2) print '<a href="'.$relurl2.'">';
+ print str_pad('',($val2['level']+1)*12,' ');
print $val2['titre'];
if ($relurl2) print '</a>';
print '</li>'."\n";
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 7f64c13dc3c..935546ce846 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -164,7 +164,7 @@ class MenuManager
|| strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php'))
{
// We add sub entry
- print str_pad('',1).'<li data-role="list-divider" class="lilevel1><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
+ print str_pad('',1).'<li data-role="list-divider" class="lilevel1"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n";
}
foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
{
@@ -176,6 +176,7 @@ class MenuManager
if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).'">';
if ($relurl2) print '<a href="'.$relurl2.'">';
+ print str_pad('',($val2['level']+1)*12,' ');
print $val2['titre'];
if ($relurl2) print '</a>';
print '</li>'."\n";
diff --git a/htdocs/includes/jquery/plugins/template/README.md b/htdocs/includes/jquery/plugins/template/README.md
deleted file mode 100644
index 5f9d6e986d9..00000000000
--- a/htdocs/includes/jquery/plugins/template/README.md
+++ /dev/null
@@ -1,346 +0,0 @@
-# JavaScript Templates
-
-## Demo
-[JavaScript Templates Demo](http://blueimp.github.com/JavaScript-Templates/)
-
-## Usage
-
-### Client-side
-Include the (minified) JavaScript Templates script in your HTML markup:
-
-```html
-<script src="tmpl.min.js"></script>
-```
-
-Add a script section with type **"text/x-tmpl"**, a unique **id** property and your template definition as content:
-
-```html
-<script type="text/x-tmpl" id="tmpl-demo">
-<h3>{%=o.title%}</h3>
-<p>Released under the
-<a href="{%=o.license.url%}">{%=o.license.name%}</a>.</p>
-<h4>Features</h4>
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
- <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-</script>
-```
-
-**"o"** (the lowercase letter) is a reference to the data parameter of the template function (see the API section on how to modify this identifier).
-
-In your application code, create a JavaScript object to use as data for the template:
-
-```js
-var data = {
- "title": "JavaScript Templates",
- "license": {
- "name": "MIT license",
- "url": "http://www.opensource.org/licenses/MIT"
- },
- "features": [
- "lightweight & fast",
- "powerful",
- "zero dependencies"
- ]
-};
-```
-
-In a real application, this data could be the result of retrieving a [JSON](http://json.org/) resource.
-
-Render the result by calling the **tmpl()** method with the id of the template and the data object as arguments:
-
-```js
-document.getElementById("result").innerHTML = tmpl("tmpl-demo", data);
-```
-
-### Server-side
-
-The following is an example how to use the JavaScript Templates engine on the server-side with [node.js](http://nodejs.org/).
-
-Create a new directory and add the **tmpl.js** file. Or alternatively, install the **blueimp-tmpl** package with [npm](http://npmjs.org/):
-
-```sh
-npm install blueimp-tmpl
-```
-
-Add a file **template.html** with the following content:
-
-```html
-<!DOCTYPE HTML>
-<title>{%=o.title%}</title>
-<h3><a href="{%=o.url%}">{%=o.title%}</a></h3>
-<h4>Features</h4>
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
- <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-```
-
-Add a file **server.js** with the following content:
-
-```js
-require("http").createServer(function (req, res) {
- var fs = require("fs"),
- // The tmpl module exports the tmpl() function:
- tmpl = require("./tmpl").tmpl,
- // Use the following version if you installed the package with npm:
- // tmpl = require("blueimp-tmpl").tmpl,
- // Sample data:
- data = {
- "title": "JavaScript Templates",
- "url": "https://github.com/blueimp/JavaScript-Templates",
- "features": [
- "lightweight & fast",
- "powerful",
- "zero dependencies"
- ]
- };
- // Override the template loading method:
- tmpl.load = function (id) {
- var filename = id + ".html";
- console.log("Loading " + filename);
- return fs.readFileSync(filename, "utf8");
- };
- res.writeHead(200, {"Content-Type": "text/x-tmpl"});
- // Render the content:
- res.end(tmpl("template", data));
-}).listen(8080, "localhost");
-console.log("Server running at http://localhost:8080/");
-```
-
-Run the application with the following command:
-
-```sh
-node server.js
-```
-
-## Requirements
-The JavaScript Templates script has zero dependencies.
-
-## API
-
-### tmpl() function
-The **tmpl()** function is added to the global **window** object and can be called as global function:
-
-```js
-var result = tmpl("tmpl-demo", data);
-```
-
-The **tmpl()** function can be called with the id of a template, or with a template string:
-
-```js
-var result = tmpl("<h3>{%=o.title%}</h3>", data);
-```
-
-If called without second argument, **tmpl()** returns a reusable template function:
-
-```js
-var func = tmpl("<h3>{%=o.title%}</h3>");
-document.getElementById("result").innerHTML = func(data);
-```
-
-### Templates cache
-Templates loaded by id are cached in the map **tmpl.cache**:
-
-```js
-var func = tmpl("tmpl-demo"), // Loads and parses the template
- cached = typeof tmpl.cache["tmpl-demo"] === "function", // true
- result = tmpl("tmpl-demo", data); // Uses cached template function
-
-tmpl.cache["tmpl-demo"] = null;
-result = tmpl("tmpl-demo", data); // Loads and parses the template again
-```
-
-### Output encoding
-The method **tmpl.encode** is used to escape HTML special characters in the template output:
-
-```js
-var output = tmpl.encode("<>&\"'\x00"); // Renders "<>&"'"
-```
-
-**tmpl.encode** makes use of the regular expression **tmpl.encReg** and the encoding map **tmpl.encMap** to match and replace special characters, which can be modified to change the behavior of the output encoding.
-Strings matched by the regular expression, but not found in the encoding map are removed from the output. This allows for example to automatically trim input values (removing whitespace from the start and end of the string):
-
-```js
-tmpl.encReg = /(^\s+)|(\s+$)|[<>&"'\x00]/g;
-var output = tmpl.encode(" Banana! "); // Renders "Banana" (without whitespace)
-```
-
-### Local helper variables
-The local variables available inside the templates are the following:
-
-* **o**: The data object given as parameter to the template function (see the next section on how to modify the parameter name).
-* **tmpl**: A reference to the **tmpl** function object.
-* **_s**: The string for the rendered result content.
-* **_e**: A reference to the **tmpl.encode** method.
-* **print**: Helper function to add content to the rendered result string.
-* **include**: Helper function to include the return value of a different template in the result.
-
-To introduce additional local helper variables, the string **tmpl.helper** can be extended. The following adds a convenience function for *console.log* and a streaming function, that streams the template rendering result back to the callback argument (note the comma at the beginning of each variable declaration):
-
-```js
-tmpl.helper += ",log=function(){console.log.apply(console, arguments)}" +
- ",st='',stream=function(cb){var l=st.length;st=_s;cb( _s.slice(l));}";
-```
-
-Those new helper functions could be used to stream the template contents to the console output:
-
-```html
-<script type="text/x-tmpl" id="tmpl-demo">
-<h3>{%=o.title%}</h3>
-{% stream(log); %}
-<p>Released under the
-<a href="{%=o.license.url%}">{%=o.license.name%}</a>.</p>
-{% stream(log); %}
-<h4>Features</h4>
-<ul>
-{% stream(log); %}
-{% for (var i=0; i<o.features.length; i++) { %}
- <li>{%=o.features[i]%}</li>
- {% stream(log); %}
-{% } %}
-</ul>
-{% stream(log); %}
-</script>
-```
-
-### Template function argument
-The generated template functions accept one argument, which is the data object given to the **tmpl(id, data)** function. This argument is available inside the template definitions as parameter **o** (the lowercase letter).
-
-The argument name can be modified by overriding **tmpl.arg**:
-
-```js
-tmpl.arg = "p";
-
-// Renders "<h3>JavaScript Templates</h3>":
-var result = tmpl("<h3>{%=p.title%}</h3>", {title: "JavaScript Templates"});
-```
-
-### Template parsing
-The template contents are matched and replaced using the regular expression **tmpl.regexp** and the replacement function **tmpl.func**. The replacement function operates based on the [parenthesized submatch strings](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String/replace#Specifying_a_function_as_a_parameter).
-
-To use different tags for the template syntax, override **tmpl.regexp** with a modified regular expression, by exchanging all occurrences of "**\\{%**" and "**%\\}**", e.g. with "**\\[%**" and "**%\\]**":
-
-```js
-tmpl.regexp = /([\s'\\])(?![^%]*%\])|(?:\[%(=|#)([\s\S]+?)%\])|(\[%)|(%\])/g;
-```
-
-By default, the plugin preserves whitespace (newlines, carriage returns, tabs and spaces). To strip unnecessary whitespace, you can override the **tmpl.func** function, e.g. with the following code:
-
-```js
-var originalFunc = tmpl.func;
-tmpl.func = function (s, p1, p2, p3, p4, p5, offset, str) {
- if (p1 && /\s/.test(p1)) {
- if (!offset || /\s/.test(str.charAt(offset - 1)) ||
- /^\s+$/g.test(str.slice(offset))) {
- return '';
- }
- return ' ';
- }
- return originalFunc.apply(tmpl, arguments);
-};
-```
-
-## Templates syntax
-
-### Interpolation
-Print variable with HTML special characters escaped:
-
-```html
-<h3>{%=o.title%}</h3>
-```
-
-Print variable without escaping:
-
-```html
-<h3>{%#o.user_id%}</h3>
-```
-
-Print output of function calls:
-
-```html
-<a href="{%=encodeURI(o.url)%}">Website</a>
-```
-
-Use dot notation to print nested properties:
-
-```html
-<strong>{%=o.author.name%}</strong>
-```
-
-Note that the JavaScript Templates engine prints **falsy** values as empty strings.
-That is, **undefined**, **null**, **false**, **0** and **NaN** will all be converted to **''**.
-To be able to print e.g. the number 0, convert it to a String before using it as an output variable:
-
-```html
-<h3>{%=0+''%}</h3>
-```
-
-### Evaluation
-Use **print(str)** to add escaped content to the output:
-
-```html
-<span>Year: {% var d=new Date(); print(d.getFullYear()); %}</span>
-```
-
-Use **print(str, true)** to add unescaped content to the output:
-
-```html
-<span>{% print("Fast & powerful", true); %}</span>
-```
-
-Use **include(str, obj)** to include content from a different template:
-
-```html
-<div>
-{% include('tmpl-link', {name: "Website", url: "http://example.org"}); %}
-</div>
-```
-
-If else condition:
-
-```html
-{% if (o.author.url) { %}
- <a href="{%=encodeURI(o.author.url)%}">{%=o.author.name%}</a>
-{% } else { %}
- <em>No author url.</em>
-{% } %}
-```
-
-For loop:
-
-```html
-<ul>
-{% for (var i=0; i<o.features.length; i++) { %}
- <li>{%=o.features[i]%}</li>
-{% } %}
-</ul>
-```
-
-## Compiled templates
-The JavaScript Templates project comes with a compilation script, that allows you to compile your templates into JavaScript code and combine them with a minimal Templates runtime into one minified JavaScript file.
-
-The compilation script is built for [node.js](http://nodejs.org/) and also requires [UglifyJS](https://github.com/mishoo/UglifyJS).
-To use it, first install both the JavaScript Templates project and UglifyJS via [npm](http://npmjs.org/):
-
-```sh
-npm install uglify-js
-npm install blueimp-tmpl
-```
-
-This will put the executables **uglifyjs** and **tmpl.js** into the folder **node_modules/.bin**. It will also make them available on your PATH if you install the packages globally (by adding the **-g** flag to the install command).
-
-The **tmpl.js** executable accepts the paths to one or multiple template files as command line arguments and prints the generated JavaScript code to the console output. The following command line shows you how to store the generated code in a new JavaScript file that can be included in your project:
-
-```sh
-tmpl.js templates/upload.html templates/download.html > tmpl.min.js
-```
-
-The files given as command line arguments to **tmpl.js** can either be pure template files or HTML documents with embedded template script sections. For the pure template files, the file names (without extension) serve as template ids.
-The generated file can be included in your project as a replacement for the original **tmpl.js** runtime. It provides you with the same API and provides a **tmpl(id, data)** function that accepts the id of one of your templates as first and a data object as optional second parameter.
-
-## License
-The JavaScript Templates script is released under the [MIT license](http://www.opensource.org/licenses/MIT).
diff --git a/htdocs/includes/jquery/plugins/template/compile.js b/htdocs/includes/jquery/plugins/template/compile.js
deleted file mode 100644
index ebca48aab4e..00000000000
--- a/htdocs/includes/jquery/plugins/template/compile.js
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env node
-/*
- * JavaScript Templates Compiler 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint nomen: true */
-/*global require, __dirname, process, console */
-
-(function () {
- "use strict";
- var tmpl = require("./tmpl.js").tmpl,
- fs = require("fs"),
- path = require("path"),
- jsp = require("uglify-js").parser,
- pro = require("uglify-js").uglify,
- // Retrieve the content of the minimal runtime:
- runtime = fs.readFileSync(__dirname + "/runtime.js", "utf8"),
- // A regular expression to parse templates from script tags in a HTML page:
- regexp = /<script( id="([\w\-]+)")? type="text\/x-tmpl"( id="([\w\-]+)")?>([\s\S]+?)<\/script>/gi,
- // A regular expression to match the helper function names:
- helperRegexp = new RegExp(
- tmpl.helper.match(/\w+(?=\s*=\s*function\s*\()/g).join("\\s*\\(|") + "\\s*\\("
- ),
- // A list to store the function bodies:
- list = [],
- code,
- ast;
- // Extend the Templating engine with a print method for the generated functions:
- tmpl.print = function (str) {
- // Only add helper functions if they are used inside of the template:
- var helper = helperRegexp.test(str) ? tmpl.helper : "",
- body = str.replace(tmpl.regexp, tmpl.func);
- if (helper || (/_e\s*\(/.test(body))) {
- helper = "_e=tmpl.encode" + helper + ",";
- }
- return "function(" + tmpl.arg + ",tmpl){" +
- ("var " + helper + "_s='" + body + "';return _s;")
- .split("_s+='';").join("") + "}";
- };
- // Loop through the command line arguments:
- process.argv.forEach(function (file, index) {
- var listLength = list.length,
- content,
- result,
- id;
- // Skipt the first two arguments, which are "node" and the script:
- if (index > 1) {
- content = fs.readFileSync(file, "utf8");
- while (true) {
- // Find templates in script tags:
- result = regexp.exec(content);
- if (!result) {
- break;
- }
- id = result[2] || result[4];
- list.push("'" + id + "':" + tmpl.print(result[5]));
- }
- if (listLength === list.length) {
- // No template script tags found, use the complete content:
- id = path.basename(file, path.extname(file));
- list.push("'" + id + "':" + tmpl.print(content));
- }
- }
- });
- // Combine the generated functions as cache of the minimal runtime:
- code = runtime.replace("{}", "{" + list.join(",") + "}");
- // Parse the code and get the initial AST (Abstract Syntac Tree):
- ast = jsp.parse(code);
- // Get a new AST with mangled names:
- ast = pro.ast_mangle(ast);
- // Get an AST with compression optimizations:
- ast = pro.ast_squeeze(ast);
- // Generate the code and print it to the console output:
- console.log(pro.gen_code(ast));
-}());
diff --git a/htdocs/includes/jquery/plugins/template/runtime.js b/htdocs/includes/jquery/plugins/template/runtime.js
deleted file mode 100644
index 4cc0c3c68b1..00000000000
--- a/htdocs/includes/jquery/plugins/template/runtime.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * JavaScript Templates Runtime 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint sloppy: true */
-/*global define */
-
-(function ($) {
- var tmpl = function (id, data) {
- var f = tmpl.cache[id];
- return data ? f(data, tmpl) : function (data) {
- return f(data, tmpl);
- };
- };
- tmpl.cache = {};
- tmpl.encReg = /[<>&"'\x00]/g;
- tmpl.encMap = {
- "<" : "<",
- ">" : ">",
- "&" : "&",
- "\"" : """,
- "'" : "'"
- };
- tmpl.encode = function (s) {
- return String(s || "").replace(
- tmpl.encReg,
- function (c) {
- return tmpl.encMap[c] || "";
- }
- );
- };
- if (typeof define === "function" && define.amd) {
- define(function () {
- return tmpl;
- });
- } else {
- $.tmpl = tmpl;
- }
-}(this));
diff --git a/htdocs/includes/jquery/plugins/template/tmpl.js b/htdocs/includes/jquery/plugins/template/tmpl.js
deleted file mode 100644
index c8b4b8658a5..00000000000
--- a/htdocs/includes/jquery/plugins/template/tmpl.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * JavaScript Templates 2.1.0
- * https://github.com/blueimp/JavaScript-Templates
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- *
- * Inspired by John Resig's JavaScript Micro-Templating:
- * http://ejohn.org/blog/javascript-micro-templating/
- */
-
-/*jslint evil: true, regexp: true */
-/*global document, define */
-
-(function ($) {
- "use strict";
- var tmpl = function (str, data) {
- var f = !/[^\w\-\.:]/.test(str) ? tmpl.cache[str] = tmpl.cache[str] ||
- tmpl(tmpl.load(str)) :
- new Function(
- tmpl.arg + ',tmpl',
- "var _e=tmpl.encode" + tmpl.helper + ",_s='" +
- str.replace(tmpl.regexp, tmpl.func) +
- "';return _s;"
- );
- return data ? f(data, tmpl) : function (data) {
- return f(data, tmpl);
- };
- };
- tmpl.cache = {};
- tmpl.load = function (id) {
- return document.getElementById(id).innerHTML;
- };
- tmpl.regexp = /([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g;
- tmpl.func = function (s, p1, p2, p3, p4, p5) {
- if (p1) { // whitespace, quote and backspace in interpolation context
- return {
- "\n": "\\n",
- "\r": "\\r",
- "\t": "\\t",
- " " : " "
- }[s] || "\\" + s;
- }
- if (p2) { // interpolation: {%=prop%}, or unescaped: {%#prop%}
- if (p2 === "=") {
- return "'+_e(" + p3 + ")+'";
- }
- return "'+(" + p3 + "||'')+'";
- }
- if (p4) { // evaluation start tag: {%
- return "';";
- }
- if (p5) { // evaluation end tag: %}
- return "_s+='";
- }
- };
- tmpl.encReg = /[<>&"'\x00]/g;
- tmpl.encMap = {
- "<" : "<",
- ">" : ">",
- "&" : "&",
- "\"" : """,
- "'" : "'"
- };
- tmpl.encode = function (s) {
- return String(s || "").replace(
- tmpl.encReg,
- function (c) {
- return tmpl.encMap[c] || "";
- }
- );
- };
- tmpl.arg = "o";
- tmpl.helper = ",print=function(s,e){_s+=e&&(s||'')||_e(s);}" +
- ",include=function(s,d){_s+=tmpl(s,d);}";
- if (typeof define === "function" && define.amd) {
- define(function () {
- return tmpl;
- });
- } else {
- $.tmpl = tmpl;
- }
-}(this));
diff --git a/htdocs/includes/jquery/plugins/template/tmpl.min.js b/htdocs/includes/jquery/plugins/template/tmpl.min.js
deleted file mode 100644
index 065532e7cae..00000000000
--- a/htdocs/includes/jquery/plugins/template/tmpl.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){"use strict";var b=function(a,c){var d=/[^\w\-\.:]/.test(a)?new Function(b.arg+",tmpl","var _e=tmpl.encode"+b.helper+",_s='"+a.replace(b.regexp,b.func)+"';return _s;"):b.cache[a]=b.cache[a]||b(b.load(a));return c?d(c,b):function(a){return d(a,b)}};b.cache={},b.load=function(a){return document.getElementById(a).innerHTML},b.regexp=/([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g,b.func=function(a,b,c,d,e,f){if(b)return{"\n":"\\n","\r":"\\r","\t":"\\t"," ":" "}[a]||"\\"+a;if(c)return c==="="?"'+_e("+d+")+'":"'+("+d+"||'')+'";if(e)return"';";if(f)return"_s+='"},b.encReg=/[<>&"'\x00]/g,b.encMap={"<":"<",">":">","&":"&",'"':""","'":"'"},b.encode=function(a){return String(a||"").replace(b.encReg,function(a){return b.encMap[a]||""})},b.arg="o",b.helper=",print=function(s,e){_s+=e&&(s||'')||_e(s);},include=function(s,d){_s+=tmpl(s,d);}",typeof define=="function"&&define.amd?define(function(){return b}):a.tmpl=b})(this);
\ No newline at end of file
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 0d913e037fa..6bf44532621 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -336,10 +336,19 @@ table.login_table .vmenu {
/* ! Message d'erreur lors du login : */
center .error { padding:8px !important; padding-left:26px !important; padding-right:20px; width:inherit; max-width:450px;color:#552323 !important; font-size:14px; border-radius:8px; text-align: left;}
-/* For hide object and add pointer cursor */
-.hideobject {display:none;}
-.linkobject {cursor:pointer;}
+
+/* ============================================================================== */
+/* Styles to hide objects */
+/* ============================================================================== */
+
+.hideobject { display:none; }
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
+.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
+<?php } ?>
+.linkobject { cursor:pointer; }
+
/* For dragging lines */
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 44cc9b39641..6068aebf385 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -62,7 +62,13 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
// Define image path files
$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif';
-//'/theme/auguria/img/menus/trtitle.png';
+
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
$img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
@@ -196,8 +202,9 @@ div.inline-block
/* ============================================================================== */
.hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
<?php } ?>
.linkobject { cursor: pointer; }
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 113ee0e5998..ea565c5d1f4 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -60,6 +60,12 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
$fontlist='arial,tahoma,verdana,helvetica';
//$fontlist='Verdana,Helvetica,Arial,sans-serif';
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
$path=''; // This value may be used in future for external module to overwrite theme
$theme='bureau2crea'; // Value of theme
if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
@@ -225,8 +231,9 @@ div.inline-block
/* ============================================================================== */
.hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
<?php } ?>
.linkobject { cursor: pointer; }
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index b33a6fd958b..ddc88ac61d9 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -60,6 +60,12 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
$fontlist='arial,tahoma,verdana,helvetica';
//$fontlist='Verdana,Helvetica,Arial,sans-serif';
+$dol_hide_topmenu=$conf->dol_hide_topmenu;
+$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$dol_use_jmobile=$conf->dol_use_jmobile;
+
$path=''; // This value may be used in future for external module to overwrite theme
$theme='cameleo'; // Value of theme
if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
@@ -201,8 +207,9 @@ div.inline-block
/* ============================================================================== */
.hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
<?php } ?>
.linkobject { cursor: pointer; }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5bc359dd58c..47e27f3f968 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -352,8 +352,9 @@ th .button {
/* ============================================================================== */
.hideobject { display: none; }
-<?php if (! empty($conf->dol_optimize_smallscreen)) { ?>
+<?php if (! empty($dol_optimize_smallscreen)) { ?>
.hideonsmartphone { display: none; }
+.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
<?php } ?>
.linkobject { cursor: pointer; }
--
GitLab