branch develop updated (a5d3efe -> 443b581)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from a5d3efe fix gitlab ci new 443b581 mise en place de la configuration de l'UI The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 443b581c95bf0ddca7b7b8c8538fcae2875977de Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Feb 28 12:28:52 2017 +0100 mise en place de la configuration de l'UI Summary of changes: Dockerfile | 32 ++++++++++++++-------------- pollen-ui-riot-js/src/main/web/conf.js | 15 +++++++++++++ pollen-ui-riot-js/src/main/web/conf.json | 15 ------------- pollen-ui-riot-js/src/main/web/index.html | 5 +++-- pollen-ui-riot-js/src/main/web/js/Session.js | 2 +- pollen-ui-riot-js/webpack.config.js | 1 + 6 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/conf.js delete mode 100644 pollen-ui-riot-js/src/main/web/conf.json -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 443b581c95bf0ddca7b7b8c8538fcae2875977de Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Feb 28 12:28:52 2017 +0100 mise en place de la configuration de l'UI --- Dockerfile | 32 ++++++++++++++-------------- pollen-ui-riot-js/src/main/web/conf.js | 15 +++++++++++++ pollen-ui-riot-js/src/main/web/conf.json | 15 ------------- pollen-ui-riot-js/src/main/web/index.html | 5 +++-- pollen-ui-riot-js/src/main/web/js/Session.js | 2 +- pollen-ui-riot-js/webpack.config.js | 1 + 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81415b1..a4eed19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,21 +38,22 @@ RUN mkdir /var/local/pollen/data # Add config for RUN echo '\ -{\n\ - "endPoint": "http://pollen.demo.codelutin.com/pollen-rest-api",\n\ - "pollDefaultPageSize": 10,\n\ - "commentDefaultPageSize": 10,\n\ - "favoriteListDefaultPageSize": 15,\n\ - "favoriteListMemberDefaultPageSize": 30,\n\ - "defaultAlertTimeInfo": 10000,\n\ - "defaultAlertTimeSuccess": 2000,\n\ - "defaultAlertTimeWarning": 5000,\n\ - "defaultAlertTimeError": -1,\n\ - "defaultDateFormat": "shortDate",\n\ - "defaultTimeFormat": "shortTime",\n\ - "defaultDateTimeFormat": "short",\n\ - "debugI18n":false\n\ -}\n\ +window.pollenConf = {\n\ + endPoint: "http://pollen.demo.codelutin.com/pollen-rest-api",\n\ + pollDefaultPageSize: 10,\n\ + commentDefaultPageSize: 10,\n\ + favoriteListDefaultPageSize: 15,\n\ + favoriteListMemberDefaultPageSize: 30,\n\ + defaultAlertTimeInfo: 10000,\n\ + defaultAlertTimeSuccess: 2000,\n\ + defaultAlertTimeWarning: 5000,\n\ + defaultAlertTimeError: -1,\n\ + defaultDateFormat: "shortDate",\n\ + defaultTimeFormat: "shortTime",\n\ + defaultDateTimeFormat: "short",\n\ + debugI18n: false\n\ +};\n\ +\n\ ' > /var/www/html/conf.js RUN echo "\ @@ -60,7 +61,6 @@ RUN echo "\ pollen.data.directory=/var/local/pollen\n\ pollen.smtp.server=smtp.codelutin.com\n\ pollen.smtp.port=25\n\ -pollen.smtp.from=pollen@codelutin.com\n\ " > /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/pollen-rest-api.properties diff --git a/pollen-ui-riot-js/src/main/web/conf.js b/pollen-ui-riot-js/src/main/web/conf.js new file mode 100644 index 0000000..1a1424f --- /dev/null +++ b/pollen-ui-riot-js/src/main/web/conf.js @@ -0,0 +1,15 @@ +window.pollenConf = { + endPoint: "http://localhost:8888/pollen-rest-api", + pollDefaultPageSize: 10, + commentDefaultPageSize: 10, + favoriteListDefaultPageSize: 15, + favoriteListMemberDefaultPageSize: 30, + defaultAlertTimeInfo: 10000, + defaultAlertTimeSuccess: 2000, + defaultAlertTimeWarning: 5000, + defaultAlertTimeError: -1, + defaultDateFormat: "shortDate", + defaultTimeFormat: "shortTime", + defaultDateTimeFormat: "short", + debugI18n: false +}; diff --git a/pollen-ui-riot-js/src/main/web/conf.json b/pollen-ui-riot-js/src/main/web/conf.json deleted file mode 100644 index 73eb556..0000000 --- a/pollen-ui-riot-js/src/main/web/conf.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "endPoint": "http://localhost:8888/pollen-rest-api", - "pollDefaultPageSize": 10, - "commentDefaultPageSize": 10, - "favoriteListDefaultPageSize": 15, - "favoriteListMemberDefaultPageSize": 30, - "defaultAlertTimeInfo": 10000, - "defaultAlertTimeSuccess": 2000, - "defaultAlertTimeWarning": 5000, - "defaultAlertTimeError": -1, - "defaultDateFormat": "shortDate", - "defaultTimeFormat": "shortTime", - "defaultDateTimeFormat": "short", - "debugI18n":false -} \ No newline at end of file diff --git a/pollen-ui-riot-js/src/main/web/index.html b/pollen-ui-riot-js/src/main/web/index.html index 69da71a..a587cd8 100644 --- a/pollen-ui-riot-js/src/main/web/index.html +++ b/pollen-ui-riot-js/src/main/web/index.html @@ -9,12 +9,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -29,6 +29,7 @@ </head> <body> <Pollen/> +<script src="./conf.js"></script> <script src="./pollen.js"></script> </body> </html> diff --git a/pollen-ui-riot-js/src/main/web/js/Session.js b/pollen-ui-riot-js/src/main/web/js/Session.js index 8136710..18186aa 100644 --- a/pollen-ui-riot-js/src/main/web/js/Session.js +++ b/pollen-ui-riot-js/src/main/web/js/Session.js @@ -29,7 +29,7 @@ class Session { // pour contenir la locale à utiliser this.locale = null; // pour contenir la configuration - this.configuration = require("../conf.json"); + this.configuration = window.pollenConf; // pour contenir les traductions this.i18n = require("../i18n.json"); // pour contenir l"utillisateur connecté diff --git a/pollen-ui-riot-js/webpack.config.js b/pollen-ui-riot-js/webpack.config.js index 5ee8822..72ab14c 100644 --- a/pollen-ui-riot-js/webpack.config.js +++ b/pollen-ui-riot-js/webpack.config.js @@ -32,6 +32,7 @@ module.exports = { new webpack.ProvidePlugin({riot: "riot"}), new CopyWebpackPlugin([ + {from: "src/main/web/conf.js"}, {from: "src/main/web/index.html"}, {from: "src/main/web/robots.txt"}, {from: "src/main/web/img", to: "img"}, -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm