Commit 543524ee authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '786-minervanet-error-report-60' into 'master'

Resolve "MINERVANET - Error Report 60"

Closes #854 and #786

See merge request !865
parents f3745a53 94b946e2
......@@ -12,6 +12,6 @@ target
.settings
/bin/
src/main/resources/*.js
src/main/resources/*.css
src/main/resources/*.map
src/main/resources/
!/src/main/css/images/marker/target/
\ No newline at end of file
This diff is collapsed.
......@@ -4,7 +4,7 @@
"description": "frontend for minerva google maps interface",
"main": "minerva.js",
"scripts": {
"build:css": "cleancss --skip-rebase -o dist/minerva.css node_modules/openlayers/dist/ol.css node_modules/dual-listbox/dist/*.css node_modules/multi-checkbox-list/dist/*.css src/main/css/*.css",
"build:css": "node scripts/build-css.js",
"build:js": "browserify --debug --standalone minerva src/main/js/minerva.js | exorcist dist/minerva.js.map > dist/minerva.js ",
"build-browser-check:js": "browserify --debug --standalone BrowserCheck src/main/js/BrowserCheck.js | exorcist dist/BrowserCheck.js.map > dist/BrowserCheck.js ",
"//": "rm -rf dist & rmdir /q /s dist & mkdir dist & browserify --debug --standalone minerva src/main/js/minerva.js | exorcist dist/minerva.js.map > dist/minerva.js & uglifyjs --compress --mangle --in-source-map dist/minerva.js.map --source-map-include-sources --source-map dist/minerva.min.js.map -o dist/minerva.min.js dist/minerva.js",
......@@ -18,21 +18,15 @@
},
"author": "Piotr Gawron",
"devDependencies": {
"assert": "1.4.1",
"bluebird": "^3.5.2",
"bootstrap": "^3.3.7",
"browserify": "^13.1.1",
"chai": "^3.5.0",
"clean-css-cli": "^4.2.1",
"datatables.net": "^1.10.19",
"del": "^3.0.0",
"exorcist": "^0.4.0",
"file-url": "^2.0.0",
"bluebird": "^3.5.5",
"browserify": "^16.5.0",
"chai": "^4.2.0",
"clean-css": "^4.2.1",
"del": "^5.0.0",
"exorcist": "^1.0.1",
"istanbul": "0.4.5",
"jquery": "3.2.1",
"jquery-ui-dist": "1.12.1",
"jsdom": "11.7.0",
"jshint": "^2.9.6",
"jshint": "^2.10.2",
"log4js-in-memory-appender": "^0.1.2",
"mkdirp": "^0.5.1",
"mocha": "^3.5.3",
......@@ -42,22 +36,30 @@
"uglifyjs": "^2.4.10"
},
"dependencies": {
"csv-stringify": "^4.0.0",
"autocomplete.js": "^0.36.0",
"bootstrap": "^4.3.1",
"csv-stringify": "^5.3.1",
"datatables.net": "^1.10.19",
"datatables.net-dt": "^1.10.19",
"datatables.net-rowreorder": "^1.2.5",
"dual-listbox": "1.0.7",
"datatables.net-rowreorder-dt": "^1.2.5",
"dual-listbox": "^1.1.0",
"file-saver": "^1.3.8",
"http-status-codes": "^1.3.0",
"http-status-codes": "^1.3.2",
"is-url": "^1.2.4",
"jstree": "^3.3.5",
"jszip": "^3.1.5",
"log4js": "4.1.0",
"jquery": "2.2.4",
"jquery-ui": "1.10.5",
"jstree": "^3.3.8",
"jszip": "^3.2.2",
"log4js": "^4.5.1",
"multi-checkbox-list": "^0.3.1",
"openlayers": "^4.6.5",
"pileup": "^0.6.9",
"pileup": "^0.6.12",
"popper.js": "^1.15.0",
"request": "^2.88.0",
"spectrum-colorpicker": "^1.8.0",
"text-encoding": "^0.6.4",
"xss": "^0.3.8"
"text-encoding": "^0.7.0",
"xss": "^1.0.6"
},
"license": "AGPL-3.0",
"bugs": {
......
......@@ -108,6 +108,21 @@
</resources>
</configuration>
</execution>
<execution>
<id>copy-images</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/src/main/resources/images</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/css/images</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
......
var process = require('process');
var fs = require('fs');
var CleanCSS = require('clean-css');
var files = [
{source: "node_modules/spectrum-colorpicker/spectrum.css"},
{source: "node_modules/bootstrap/dist/css/bootstrap.css"},
{source: "node_modules/jquery-ui/themes/base/jquery.ui.all.css", targetBase: "../../minerva/resources/jquery-ui/"},
{source: "node_modules/datatables.net-dt/css/jquery.dataTables.css", targetBase: "../../minerva/resources/datatables/css/"},
{source: "node_modules/datatables.net-rowreorder-dt/css/rowReorder.dataTables.css"},
{source: "node_modules/jstree/dist/themes/default/style.css", targetBase: "../../minerva/resources/jstree/"},
{source: "node_modules/pileup/style/pileup.css"},
{source: "node_modules/openlayers/dist/ol.css"},
{source: "node_modules/dual-listbox/dist/dual-listbox.css"},
{source: "node_modules/multi-checkbox-list/dist/multi-checkbox-list.css"},
{source: "src/main/css/global.css", targetBase: "../../minerva/resources/"}
];
var inputs = [];
for (var i = 0; i < files.length; i++) {
var file = files[i];
var output = new CleanCSS({rebase: false}).minify([file.source]);
if (output.errors.length > 0) {
console.log("Problem with css: ", output.errors);
process.exit(-1);
}
if (output.warnings.length > 0) {
console.log("Problem with css: ", output.warnings);
process.exit(-2);
}
file.content = output.styles;
var tmp = file.source.split("/");
file.filename = tmp[tmp.length - 1];
var input = {};
var base = "./";
if (file.targetBase !== undefined) {
base = file.targetBase;
}
input[base + file.filename] = {styles: file.content};
inputs.push(input);
}
return new CleanCSS({returnPromise: true, rebaseTo: '.'}).minify(inputs).then(function (output) {
if (output.errors.length > 0) {
console.log("Problem with css: ", output.errors);
process.exit(-1);
}
if (output.warnings.length > 0) {
console.log("Problem with css: ", output.warnings);
process.exit(-2);
}
fs.writeFile("dist/minerva.css", output.styles, function (err) {
if (err) {
console.log("Problem with writing to file", err);
process.exit(-3);
}
});
}).catch(function (err) {
console.log(err);
process.exit(-4);
});
html {
font-size: 14px;
}
button, input, optgroup, select, textarea {
color: inherit;
}
body {
color: #333;
}
h5 {
font-size: 14px;
}
.table > tbody > tr > td,
.table > tbody > tr > th,
.table > tfoot > tr > td,
.table > tfoot > tr > th,
.table > thead > tr > td,
.table > thead > tr > th {
padding: 8px;
}
.table {
color: #666;
}
.ui-widget-content a {
text-decoration: underline;
}
......@@ -287,6 +316,24 @@
cursor: pointer;
}
.minerva-pages-logo {
background-image: url("images/minerva-logo.png");
background-repeat: no-repeat;
width: 25px;
height: 25px;
background-size: 25px 25px;
margin-bottom: -5px;
display: inline-block;
}
.minerva-profile-img {
background-image: url("images/profile.png");
background-repeat: no-repeat;
width: 71px;
height: 71px;
float: left;
}
.minerva-center-map-button > i.fa {
font-size: 24px;
color: grey
......@@ -680,26 +727,21 @@ h1 {
/**
error report dialog style
*/
.report-dialog label.ui-checkboxradio-label {
.report-dialog label {
border: 1px solid #fff;
}
.report-dialog label.ui-checkboxradio-label:active {
background: rgb(32, 189, 241);
width: 100%;
}
.report-dialog label.ui-checkboxradio-checked {
background: rgb(32, 189, 241);
border: 1px solid #fff;
}
.report-dialog label.ui-checkboxradio-checked:hover {
.report-dialog label:hover {
background: rgb(152, 220, 243);
border: 1px solid #fff;
}
.report-dialog span.ui-icon-info {
float: right;
margin-top: 3px;
}
.report-tooltip {
......@@ -750,10 +792,27 @@ disabled close button in dialogs
.ui-icon {
display: inline-block;
vertical-align: middle;
margin-top: -.25em;
}
.ui-icon-refresh {
background: url(images/icons/refresh.png.xhtml) 50% 50% no-repeat;
background: url(images/icons/refresh.png) 50% 50% no-repeat;
}
a.minerva-search-link:hover {
text-decoration: none;
}
.minerva-search-button {
background-image: url(images/icons/search.png);
width: 28px;
height: 28px;
font-size: 24px;
}
.minerva-search-button:before {
content: "\000a0\000a0\000a0\000a0\000a0\000a0"
}
.nav > li > a {
......@@ -947,6 +1006,7 @@ a.adminLink:hover {
color: #666666;
font-size: 13px;
font-weight: 900;
box-sizing: unset;
}
.minerva-login-form-title {
......@@ -1130,3 +1190,57 @@ input[type=file] {
padding: 5px;
display: none;
}
/**
* For autocomplete.js (https://github.com/algolia/autocomplete.js#look-and-feel)
*/
.algolia-autocomplete {
width: 100%;
}
.algolia-autocomplete .aa-input, .algolia-autocomplete .aa-hint {
width: 100%;
}
.algolia-autocomplete .aa-hint {
color: #999;
}
.algolia-autocomplete .aa-dropdown-menu {
width: 100%;
background-color: #fff;
border: 1px solid #999;
border-top: none;
}
.algolia-autocomplete .aa-dropdown-menu .aa-suggestion {
cursor: pointer;
padding: 5px 4px;
}
.algolia-autocomplete .aa-dropdown-menu .aa-suggestion.aa-cursor {
background-color: #B2D7FF;
}
.algolia-autocomplete .aa-dropdown-menu .aa-suggestion em {
font-weight: bold;
font-style: normal;
}
.carousel-control-prev {
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
background-image: -o-linear-gradient(left, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));
background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
background-repeat: repeat-x;
}
.carousel-control-next {
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
background-image: -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));
background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
background-repeat: repeat-x;
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment