From a818422302ca312fc24130ebdb97e4febd475c20 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Oct 2017 21:24:17 +0200 Subject: [PATCH] Update jsgantt to 1.7.5.4 --- COPYRIGHT | 2 +- dev/dolibarr_changes.txt | 8 +- htdocs/includes/jsgantt/CONTRIBUTING.md | 180 + htdocs/includes/jsgantt/LICENSE | 51 + htdocs/includes/jsgantt/README.md | 21 + htdocs/includes/jsgantt/home-bg.jpg | Bin 0 -> 380517 bytes htdocs/includes/jsgantt/index.htm | 564 --- htdocs/includes/jsgantt/index.html | 1167 +++++ htdocs/includes/jsgantt/jsgantt.css | 105 +- htdocs/includes/jsgantt/jsgantt.js | 4380 +++++++++-------- htdocs/includes/jsgantt/jsgantt.min.js | 2 - htdocs/includes/jsgantt/jsgantt_Minutes.html | 548 --- .../jsgantt/jsgantt_exExternalXML.html | 533 -- htdocs/includes/jsgantt/main.css | 126 + htdocs/includes/jsgantt/main.js | 85 + htdocs/includes/jsgantt/project.xml | 196 +- htdocs/projet/ganttchart.inc.php | 9 +- htdocs/projet/ganttview.php | 2 +- htdocs/projet/jsgantt_language.js.php | 2 +- htdocs/theme/eldy/style.css.php | 35 +- 20 files changed, 4042 insertions(+), 3974 deletions(-) create mode 100644 htdocs/includes/jsgantt/CONTRIBUTING.md create mode 100644 htdocs/includes/jsgantt/LICENSE create mode 100644 htdocs/includes/jsgantt/README.md create mode 100644 htdocs/includes/jsgantt/home-bg.jpg delete mode 100644 htdocs/includes/jsgantt/index.htm create mode 100644 htdocs/includes/jsgantt/index.html delete mode 100644 htdocs/includes/jsgantt/jsgantt.min.js delete mode 100644 htdocs/includes/jsgantt/jsgantt_Minutes.html delete mode 100644 htdocs/includes/jsgantt/jsgantt_exExternalXML.html create mode 100644 htdocs/includes/jsgantt/main.css create mode 100644 htdocs/includes/jsgantt/main.js diff --git a/COPYRIGHT b/COPYRIGHT index 427784a1552..95cc95fcf47 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -50,7 +50,7 @@ jQuery jquerytreeview 1.4.1 MIT License Yes jQuery TableDnD 0.6 GPL and MIT License Yes JS library plugin TableDnD (to reorder table rows) jQuery Timepicker 1.1.0 GPL and MIT License Yes JS library Timepicker addon for Datepicker jQuery Tiptip 1.3 GPL and MIT License Yes JS library for tooltips -jsGanttImproved 1.7.5.2 BSD License Yes JS library (to build Gantt reports) +jsGanttImproved 1.7.5.4 BSD License Yes JS library (to build Gantt reports) JsTimezoneDetect 1.0.6 MIT License Yes JS library to detect user timezone SwaggerUI 2.0.24 GPL-2+ Yes JS library to offer the REST API explorer Ace 1.2.8 BSD Yes JS library to get code syntaxique coloration in a textarea. diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt index 3b9ef4cc447..945e7d36ca7 100644 --- a/dev/dolibarr_changes.txt +++ b/dev/dolibarr_changes.txt @@ -82,8 +82,14 @@ with // LDR To open in same window //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth); window.location.href=pRef -* Replace hard coded string with i18n["String"]; +* Replace +vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getResource()); +with +var vTmpNode=this.newNode(vTmpCell, 'div', null, ''); +vTmpNode=this.newNode(vTmpNode, 'a', null, '', vLangs[vLang]['moreinfo']); +vTmpNode.setAttribute('href',vTaskList[i].getLink()); + JCROP: ------ diff --git a/htdocs/includes/jsgantt/CONTRIBUTING.md b/htdocs/includes/jsgantt/CONTRIBUTING.md new file mode 100644 index 00000000000..fa7bb2ca8d5 --- /dev/null +++ b/htdocs/includes/jsgantt/CONTRIBUTING.md @@ -0,0 +1,180 @@ +# Contributing to jsGanttImproved + +We'd love for you to contribute to our source code and to make jsGanttImproved even better than it is +today! Here are the guidelines we'd like you to follow: + + - [Issues and Bugs](#issue) + - [Feature Requests](#feature) + - [Submission Guidelines](#submit) + - [Coding Rules](#rules) + - [Commit Message Guidelines](#commit) + - [Further Info](#info) + +## Found an Issue? + +If you find a bug in the source code or a mistake in the documentation, you can help us by +submitting an issue to our [GitHub Repository][github]. Even better you can submit a Pull Request +with a fix. + +**Please see the [Submission Guidelines](#submit) below.** + +## Want a Feature? + +You can request a new feature by submitting an issue to our [GitHub Repository][github]. If you +would like to implement a new feature then it can be crafted and submitted as a Pull Request. + +## Submission Guidelines + +### Submitting an Issue +Before you submit your issue search the archive, maybe your question was already answered. + +If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize +the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. +Providing the following information will increase the chances of your issue being dealt with +quickly: + +* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps +* **Motivation for or Use Case** - explain why this is a bug for you +* **Version(s)** - what is the version(s) being used? +* **Browsers and Operating System** - is this a problem with all browsers or only specific ones? +* **Reproduce the Error** - provide a live example (using [Plunker][plunker] or + [JSFiddle][jsfiddle]) or an unambiguous set of steps. +* **Related Issues** - has a similar issue been reported before? +* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be + causing the problem (line of code or commit) + +### Submitting a Pull Request +Before you submit your pull request consider the following guidelines: + +* Search [GitHub](https://github.com/jsGanttImproved/jsgantt-improved/pulls) for an open or closed Pull Request + that relates to your submission. You don't want to duplicate effort. +* Make your changes in a new git branch: + + ```shell + git checkout -b my-fix-branch master + ``` + +* Create your patch. +* Follow our [Coding Rules](#rules). +* Commit your changes using a descriptive commit message that follows our + [commit message conventions](#commit). + + ```shell + git commit -a + ``` + Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files. + +* Push your branch to GitHub: + + ```shell + git push origin my-fix-branch + ``` + +In GitHub, send a pull request to `master`. +If we suggest changes, then: + +* Make the required updates. +* Commit your changes to your branch (e.g. `my-fix-branch`). +* Push the changes to your GitHub repository (this will update your Pull Request). + +If the PR gets too outdated we may ask you to rebase and force push to update the PR: + +```shell +git rebase master -i +git push origin my-fix-branch -f +``` + +_WARNING: Squashing or reverting commits and force-pushing thereafter may remove GitHub comments +on code that were previously made by you or others in your commits. Avoid any form of rebasing +unless necessary._ + +That's it! Thank you for your contribution! + +#### After your pull request is merged + +After your pull request is merged, you can safely delete your branch and pull the changes +from the main (upstream) repository: + +* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows: + + ```shell + git push origin --delete my-fix-branch + ``` + +* Check out the master branch: + + ```shell + git checkout master -f + ``` + +* Delete the local branch: + + ```shell + git branch -D my-fix-branch + ``` + +* Update your master with the latest upstream version: + + ```shell + git pull --ff upstream master + ``` + +## Coding Rules + +To ensure consistency throughout the source code, keep these rules in mind as you are working: + +* With the exceptions listed below, we follow the rules contained in + [Google's JavaScript Style Guide][js-style-guide]: + * Wrap all code at **100 characters**. + +## Git Commit Guidelines + +We have very precise rules over how our git commit messages can be formatted. This leads to **more +readable messages** that are easy to follow when looking through the **project history**. + +### Commit Message Format +Each commit message consists of a **subject**, a **body** and a **footer**: + +``` + + + + +