Commit 3a7e3805 authored by Matija Obreza's avatar Matija Obreza

Imported genesys-ui

parent 7b3668e2
......@@ -3,9 +3,9 @@
module.exports = function(grunt) {
// Load grunt tasks automatically
require('load-grunt-tasks')(grunt);
require('grunt-newer')(grunt);
require('time-grunt')(grunt);
require('jit-grunt')(grunt);
// require('grunt-newer')(grunt);
// require('time-grunt')(grunt);
// require('jit-grunt')(grunt);
grunt.initConfig({
......@@ -192,13 +192,13 @@ module.exports = function(grunt) {
jshint : {
options : {
jshintrc : '.jshintrc',
reporter : require('jshint-stylish')
//reporter : require('jshint-stylish')
},
dist : {
src : [ 'Gruntfile.js', '<%= app.source %>/js/{,*/}*.js' ]
src : [ '<%= app.source %>/js/{,*/}*.js' ]
},
dist1 : {
src : [ 'Gruntfile.js', '<%= app.source1 %>/js/{,*/}*.js' ]
src : [ '<%= app.source1 %>/js/{,*/}*.js' ]
},
},
......@@ -308,11 +308,11 @@ module.exports = function(grunt) {
'<%= app.dist1 %>/styles/bootstrap.min.css' : [ '<%= app.dist1 %>/styles/bootstrap.css' ],
'<%= app.dist1 %>/styles/other.min.css' : [ '<%= app.dist1 %>/styles/jquery-ui.css', '<%= app.dist1 %>/styles/forza.css', '<%= app.dist1 %>/styles/leaflet.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker.css', '<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css' ],
'<%= app.dist1 %>/styles/genesys.min.css' : [ '<%= app.dist1 %>/styles/genesys.css' ],
'<%= app.dist1 %>/styles/genesys.min.css' : [ '<%= app.dist1 %>/styles/genesys.css', '<%= app.dist1 %>/styles/welcome.css' ],
'<%= app.dist1 %>/styles/all.min.css' : [ '<%= app.dist1 %>/styles/bootstrap.css', '<%= app.dist1 %>/styles/jquery-ui.css',
'<%= app.dist1 %>/styles/forza.css', '<%= app.dist1 %>/styles/leaflet.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker.css', '<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css',
'<%= app.dist1 %>/styles/genesys.css'],
'<%= app.dist1 %>/styles/genesys.css', '<%= app.dist1 %>/styles/welcome.css'],
}
}
},
......@@ -348,47 +348,39 @@ module.exports = function(grunt) {
}
},
sass: { // Task
dist: { // Target
options: { // Target options
style: 'expanded'
},
files: { // Dictionary of files
'src/main/webapp/html/styles/genesys.css': 'src/main/sourceapp/styles/genesys.scss',
'src/main/webapp/html/styles/pages.css':'src/main/sourceapp/styles/pages.scss'
}
},
dist1: {
connect: {
server: {
options: {
style: 'expanded'
},
files: {
'src/main/webapp/1/html/styles/genesys.css': 'src/main/sourceapp/1/styles/genesys.scss',
port: 9000,
base: 'src/main/webapp',
livereload: true
}
}
},
watch: {
css: {
files: ['src/main/sourceapp/styles/genesys.scss', 'src/main/sourceapp/styles/pages.scss'],
tasks: ['sass'],
compassdist1: {
files: ['src/main/sourceapp/1/{,*/}*.scss'],
tasks: ['compass:dist1', 'cssmin:dist1'],
options: {
livereload: true
}
}
},
js1: {
files: ['src/main/sourceapp/1/{,*/}*.js'],
tasks: ['newer:jshint:dist1','concat:world1', 'concat:app1'],
options: {
livereload: true
}
}
}
});
// grunt.registerTask('serve', [ 'clean', 'copy:css', 'compass:server',
// 'autoprefixer', 'uglify:server' ]);
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-newer');
// grunt.registerTask('serve', [ 'clean', 'copy:css', 'compass:server', 'autoprefixer', 'uglify:server' ]);
// grunt.loadNpmTasks('grunt-contrib-sass');
// grunt.loadNpmTasks('grunt-contrib-watch');
// grunt.loadNpmTasks('grunt-newer');
grunt.registerTask('build0', [ 'newer:jshint:dist', 'compass:dist', 'copy:dist', 'concat:dist', 'concat:world', 'concat:app', 'autoprefixer:dist', 'uglify:dist', 'cssmin:dist' ]);
grunt.registerTask('build1', [ 'newer:jshint:dist1', 'compass:dist1', 'copy:dist1', 'concat:dist1', 'concat:world1', 'concat:app1', 'autoprefixer:dist1', 'uglify:dist1', 'cssmin:dist1' ]);
......@@ -397,4 +389,6 @@ module.exports = function(grunt) {
grunt.registerTask('default', [ 'build0', 'build1' ]);
grunt.registerTask('build', [ 'build0', 'build1' ]);
// Start web server
grunt.registerTask('serve', ['build','connect:server','watch']);
};
{
"name": "genesys2-server",
"version": "0.0.1",
"version": "1.1",
"appPath": "src/main/sourceapp",
"dependencies": {
"jquery": "~2.1.3",
......
{
"name": "genesys2-server",
"version": "0.0.1",
"description": "Web stuffies for genesys2-server",
"repository": {},
"name": "genesys-ui",
"version": "1.1.0",
"description": "Web stuffies for genesys-ui",
"private": true,
"engines": {
"node": ">=0.10.0"
},
"devDependencies": {
"bower": "~1.5",
"grunt": "~0.4.5",
"grunt-autoprefixer": "~3.0.3",
"grunt-cli": "~0.1.13",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compass": "^1.0.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "~0.8.1",
"grunt-contrib-cssmin": "~0.14.0",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-sass": "^0.9.2",
"grunt-contrib-uglify": "~0.9.2",
"grunt-contrib-watch": "^0.6.1",
"grunt-newer": "^1.1.1",
"jit-grunt": "~0.9.0",
"jshint-stylish": "~2.0.1",
"load-grunt-tasks": "~3.3.0",
"time-grunt": "~1.2.1"
"bower": "~1.7.5",
"grunt": "~1.0.1",
"grunt-autoprefixer": "^3.0.4",
"grunt-cli": "~1.2",
"grunt-contrib-clean": "^1.0",
"grunt-contrib-compass": "^1.0",
"grunt-contrib-concat": "^1.0",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0",
"grunt-contrib-cssmin": "^1.0",
"grunt-contrib-jshint": "^1.0",
"grunt-contrib-uglify": "^1.0",
"grunt-contrib-watch": "^1.0",
"grunt-newer": "^1.2.0",
"load-grunt-tasks": "^3.5",
"time-grunt": "^1.3.0"
}
}
......@@ -570,8 +570,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v0.10.36</nodeVersion>
<npmVersion>2.4.1</npmVersion>
<nodeVersion>v4.4.4</nodeVersion>
<npmVersion>2.15.1</npmVersion>
</configuration>
</execution>
<execution>
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 22.7 22.7" style="enable-background:new 0 0 22.7 22.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#88B941;}
</style>
<path class="st0" d="M11.3,0C5.1,0,0,5.1,0,11.3c0,6.3,5.1,11.3,11.3,11.3s11.3-5.1,11.3-11.3C22.7,5.1,17.6,0,11.3,0z M11.4,19.7
c0,0.1-0.1,0.2,0,0.2c0,0,0,0.1,0,0.1c0,0.1,0,0.1,0,0.2c0,0,0,0.1-0.1,0.1l-0.1,0.1c-2.2-0.6-4-2.3-5.4-4c-1.5-1.9-2.7-4.2-3.1-6.6
C2.5,8.5,2.5,7.2,3,5.9c2.5,1.6,4.6,3.9,6.2,6.4C10.5,14.5,11.4,17,11.4,19.7C11.4,19.6,11.4,19.6,11.4,19.7z M11.5,11.7
c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0c0,0-0.1,0-0.1,0.1c0,0,0,0-0.1,0l-0.1,0c-0.9-1-1.3-2.4-1.5-3.7C9.4,6.9,9.5,5.4,10,4.1
c0.3-0.7,0.7-1.4,1.3-1.9c0.8,1.6,1.2,3.3,1.2,5.1C12.6,8.8,12.3,10.4,11.5,11.7C11.5,11.7,11.5,11.7,11.5,11.7z M17.3,12.6
c-1.2,1.7-2.8,3.2-4.7,4c0,0,0,0,0,0c-0.1,0-0.1,0-0.2,0c0,0-0.1,0-0.1,0c-0.1,0-0.1,0-0.1,0c0,0-0.1,0-0.1,0l-0.1-0.1
c-0.2-1.8,0.4-3.7,1.3-5.3c1-1.7,2.3-3.3,4-4.4c0.9-0.6,1.9-1,3-1C19.7,8.3,18.7,10.6,17.3,12.6z"/>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 56.2 14" style="enable-background:new 0 0 56.2 14;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E7E5DF;}
</style>
<g>
<path class="st0" d="M8.2,9.4c-0.3,0.4-0.7,0.7-1.3,1.1C6.2,10.8,5.4,11,4.4,11c-1.3,0-2.3-0.4-3.2-1.2C0.4,8.9,0,7.9,0,6.6V4.4
C0,3.1,0.4,2,1.2,1.2C1.9,0.4,2.9,0,4.2,0C5.4,0,6.3,0.3,7,0.9s1.1,1.4,1.1,2.3l0,0H6.7c0-0.6-0.3-1.1-0.7-1.5
C5.6,1.3,5,1.1,4.2,1.1c-0.8,0-1.5,0.3-2,0.9S1.5,3.4,1.5,4.4v2.2c0,0.9,0.3,1.7,0.8,2.3s1.3,0.9,2.1,0.9c0.6,0,1.1-0.1,1.5-0.2
C6.3,9.4,6.6,9.3,6.7,9V6.6H4.4V5.5h3.8V9.4z"/>
<path class="st0" d="M13.7,11c-1.1,0-2-0.4-2.6-1.1c-0.7-0.7-1-1.7-1-2.9V6.7c0-1.1,0.3-2.1,1-2.8c0.7-0.7,1.5-1.1,2.4-1.1
c1.1,0,1.9,0.3,2.4,1c0.5,0.6,0.8,1.5,0.8,2.6v0.9h-5.1l0,0c0,0.8,0.2,1.4,0.6,1.9s0.9,0.7,1.6,0.7c0.5,0,0.9-0.1,1.3-0.2
c0.4-0.1,0.7-0.3,1-0.6l0.6,0.9c-0.3,0.3-0.7,0.5-1.1,0.7C14.9,10.9,14.3,11,13.7,11z M13.5,3.9c-0.5,0-0.9,0.2-1.2,0.6
c-0.3,0.4-0.6,0.9-0.6,1.5l0,0h3.7V5.9c0-0.6-0.2-1-0.5-1.4S14.1,3.9,13.5,3.9z"/>
<path class="st0" d="M19.6,2.9l0.1,1.2c0.3-0.4,0.6-0.7,1-1c0.4-0.2,0.9-0.3,1.4-0.3c0.9,0,1.5,0.3,2,0.8s0.7,1.3,0.7,2.3v5h-1.4
v-5c0-0.7-0.1-1.2-0.4-1.5c-0.3-0.3-0.7-0.4-1.3-0.4c-0.4,0-0.8,0.1-1.1,0.3C20.2,4.4,20,4.7,19.8,5v5.8h-1.4V2.9H19.6z"/>
<path class="st0" d="M30.1,11c-1.1,0-2-0.4-2.6-1.1c-0.7-0.7-1-1.7-1-2.9V6.7c0-1.1,0.3-2.1,1-2.8c0.7-0.7,1.5-1.1,2.4-1.1
c1.1,0,1.9,0.3,2.4,1c0.5,0.6,0.8,1.5,0.8,2.6v0.9H28l0,0c0,0.8,0.2,1.4,0.6,1.9s0.9,0.7,1.6,0.7c0.5,0,0.9-0.1,1.3-0.2
c0.4-0.1,0.7-0.3,1-0.6l0.6,0.9c-0.3,0.3-0.7,0.5-1.1,0.7C31.4,10.9,30.8,11,30.1,11z M29.9,3.9c-0.5,0-0.9,0.2-1.2,0.6
c-0.3,0.4-0.6,0.9-0.6,1.5l0,0h3.7V5.9c0-0.6-0.2-1-0.5-1.4S30.5,3.9,29.9,3.9z"/>
<path class="st0" d="M39.4,8.7c0-0.3-0.1-0.6-0.4-0.8c-0.2-0.2-0.7-0.4-1.4-0.5c-1-0.2-1.7-0.5-2.2-0.9c-0.5-0.4-0.7-0.8-0.7-1.5
c0-0.6,0.3-1.2,0.8-1.6c0.5-0.5,1.3-0.7,2.1-0.7c0.9,0,1.7,0.2,2.2,0.7c0.5,0.5,0.8,1,0.8,1.7l0,0h-1.4c0-0.3-0.1-0.7-0.4-0.9
c-0.3-0.3-0.7-0.4-1.2-0.4c-0.5,0-0.9,0.1-1.1,0.3c-0.2,0.2-0.4,0.5-0.4,0.8c0,0.3,0.1,0.6,0.3,0.7c0.2,0.2,0.7,0.3,1.3,0.5
c1,0.2,1.7,0.5,2.2,0.9c0.5,0.4,0.7,0.9,0.7,1.5c0,0.7-0.3,1.3-0.9,1.7c-0.6,0.4-1.3,0.7-2.2,0.7c-1,0-1.8-0.3-2.4-0.8
s-0.9-1.1-0.8-1.8l0,0h1.4c0,0.5,0.2,0.9,0.6,1.1c0.4,0.2,0.8,0.4,1.3,0.4c0.5,0,0.9-0.1,1.2-0.3C39.2,9.3,39.4,9,39.4,8.7z"/>
<path class="st0" d="M45,7.9l0.3,1h0l1.9-6h1.6L45.6,12c-0.2,0.5-0.5,1-0.9,1.4c-0.4,0.4-0.9,0.6-1.5,0.6c-0.1,0-0.3,0-0.4,0
s-0.3-0.1-0.4-0.1l0.1-1.1c0,0,0.1,0,0.3,0c0.2,0,0.3,0,0.4,0c0.3,0,0.6-0.1,0.8-0.4s0.4-0.6,0.5-0.9l0.3-0.8l-2.9-7.8h1.6L45,7.9z
"/>
<path class="st0" d="M54.8,8.7c0-0.3-0.1-0.6-0.4-0.8c-0.2-0.2-0.7-0.4-1.4-0.5c-1-0.2-1.7-0.5-2.2-0.9c-0.5-0.4-0.7-0.8-0.7-1.5
c0-0.6,0.3-1.2,0.8-1.6c0.5-0.5,1.3-0.7,2.1-0.7c0.9,0,1.7,0.2,2.2,0.7c0.5,0.5,0.8,1,0.8,1.7l0,0h-1.4c0-0.3-0.1-0.7-0.4-0.9
C54,4,53.6,3.9,53.1,3.9c-0.5,0-0.9,0.1-1.1,0.3c-0.2,0.2-0.4,0.5-0.4,0.8c0,0.3,0.1,0.6,0.3,0.7c0.2,0.2,0.7,0.3,1.3,0.5
c1,0.2,1.7,0.5,2.2,0.9C56,7.5,56.2,8,56.2,8.6c0,0.7-0.3,1.3-0.9,1.7c-0.6,0.4-1.3,0.7-2.2,0.7c-1,0-1.8-0.3-2.4-0.8
s-0.9-1.1-0.8-1.8l0,0h1.4c0,0.5,0.2,0.9,0.6,1.1c0.4,0.2,0.8,0.4,1.3,0.4c0.5,0,0.9-0.1,1.2-0.3C54.6,9.3,54.8,9,54.8,8.7z"/>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="612px" height="152.455px" viewBox="0 319.772 612 152.455" enable-background="new 0 319.772 612 152.455"
xml:space="preserve">
<g>
<path fill="#2B2924" d="M89.295,422.135c-3.267,4.356-7.623,7.623-14.157,11.979c-7.623,3.267-16.334,5.444-27.224,5.444
c-14.157,0-25.046-4.355-34.847-13.067C4.356,416.69,0,405.801,0,391.644v-23.957c0-14.157,4.356-26.135,13.067-34.847
c7.623-8.712,18.513-13.067,32.669-13.067c13.067,0,22.868,3.267,30.491,9.8c7.623,6.534,11.979,15.246,11.979,25.046l0,0H72.961
c0-6.534-3.267-11.979-7.623-16.334c-4.355-4.356-10.89-6.534-19.601-6.534c-8.712,0-16.334,3.267-21.779,9.801
c-5.445,6.534-7.623,15.246-7.623,26.135v23.957c0,9.801,3.267,18.512,8.712,25.046s14.156,9.801,22.868,9.801
c6.534,0,11.979-1.089,16.334-2.178c4.356-2.179,7.623-3.268,8.712-6.534v-26.135H47.915v-11.979h41.381V422.135z"/>
<path fill="#2B2924" d="M149.188,439.559c-11.979,0-21.779-4.355-28.313-11.979c-7.623-7.623-10.89-18.513-10.89-31.58v-3.267
c0-11.979,3.267-22.868,10.89-30.491c7.623-7.623,16.334-11.979,26.135-11.979c11.979,0,20.69,3.267,26.135,10.89
c5.445,6.534,8.711,16.334,8.711,28.313v9.801H126.32l0,0c0,8.711,2.178,15.245,6.534,20.689c4.356,5.445,9.801,7.623,17.423,7.623
c5.445,0,9.801-1.089,14.157-2.178s7.623-3.268,10.89-6.534l6.534,9.801c-3.267,3.267-7.623,5.445-11.979,7.623
C162.256,438.47,155.723,439.559,149.188,439.559z M147.011,362.242c-5.445,0-9.801,2.178-13.068,6.534
c-3.267,4.356-6.534,9.801-6.534,16.334l0,0h40.292v-1.089c0-6.534-2.178-10.89-5.445-15.246
C158.989,364.42,153.544,362.242,147.011,362.242z"/>
<path fill="#2B2924" d="M213.438,351.353l1.089,13.067c3.267-4.356,6.534-7.623,10.89-10.89c4.356-2.178,9.801-3.267,15.246-3.267
c9.801,0,16.334,3.267,21.779,8.712s7.623,14.157,7.623,25.046v54.448h-15.246v-54.448c0-7.623-1.089-13.068-4.355-16.334
c-3.267-3.267-7.623-4.356-14.157-4.356c-4.356,0-8.712,1.089-11.979,3.267c-4.356,1.089-6.534,4.356-8.712,7.623v63.16H200.37
v-86.028H213.438z"/>
<path fill="#2B2924" d="M327.779,439.559c-11.979,0-21.779-4.355-28.313-11.979c-7.623-7.623-10.889-18.513-10.889-31.58v-3.267
c0-11.979,3.267-22.868,10.889-30.491c7.623-7.623,16.335-11.979,26.136-11.979c11.979,0,20.69,3.267,26.135,10.89
c5.445,6.534,8.712,16.334,8.712,28.313v9.801h-55.537l0,0c0,8.711,2.178,15.245,6.534,20.689c4.355,5.445,9.8,7.623,17.423,7.623
c5.445,0,9.801-1.089,14.157-2.178c4.355-1.089,7.622-3.268,10.89-6.534l6.533,9.801c-3.267,3.267-7.623,5.445-11.979,7.623
C341.936,438.47,335.402,439.559,327.779,439.559z M325.602,362.242c-5.445,0-9.801,2.178-13.067,6.534
c-3.268,4.356-6.534,9.801-6.534,16.334l0,0h40.292v-1.089c0-6.534-2.178-10.89-5.445-15.246
C337.58,364.42,332.135,362.242,325.602,362.242z"/>
<path fill="#2B2924" d="M429.054,414.513c0-3.267-1.089-6.534-4.356-8.712c-2.178-2.178-7.622-4.355-15.245-5.445
c-10.89-2.178-18.513-5.444-23.958-9.8c-5.444-4.356-7.622-8.712-7.622-16.334c0-6.534,3.267-13.068,8.712-17.423
c5.444-5.445,14.156-7.623,22.868-7.623c9.801,0,18.513,2.178,23.957,7.623c5.445,5.445,8.712,10.89,8.712,18.512l0,0h-15.246
c0-3.267-1.089-7.623-4.355-9.801c-3.267-3.267-7.623-4.356-13.067-4.356c-5.445,0-9.801,1.089-11.979,3.267
c-2.179,2.178-4.356,5.445-4.356,8.712c0,3.267,1.089,6.534,3.267,7.623c2.179,2.178,7.623,3.267,14.157,5.445
c10.89,2.178,18.513,5.445,23.957,9.801c5.445,4.355,7.623,9.801,7.623,16.334c0,7.623-3.268,14.157-9.801,18.513
c-6.534,4.356-14.156,7.623-23.957,7.623c-10.89,0-19.602-3.267-26.136-8.712c-6.534-5.444-9.801-11.979-8.712-19.602l0,0h15.246
c0,5.445,2.178,9.801,6.533,11.979c4.356,2.179,8.712,4.356,14.157,4.356c5.444,0,9.801-1.089,13.067-3.267
C426.875,421.046,429.054,417.779,429.054,414.513z"/>
<path fill="#2B2924" d="M490.035,405.801l3.268,10.89l0,0l20.69-65.338h17.423l-34.847,99.096
c-2.178,5.445-5.444,10.89-9.801,15.246c-4.355,4.355-9.801,6.533-16.334,6.533c-1.09,0-3.268,0-4.356,0s-3.267-1.089-4.355-1.089
l1.089-11.979c0,0,1.089,0,3.267,0s3.267,0,4.355,0c3.268,0,6.534-1.089,8.712-4.355c2.179-3.268,4.356-6.534,5.445-9.801
l3.267-8.712l-31.58-84.939h17.424L490.035,405.801z"/>
<path fill="#2B2924" d="M596.755,414.513c0-3.267-1.089-6.534-4.356-8.712c-2.178-2.178-7.623-4.355-15.245-5.445
c-10.89-2.178-18.513-5.444-23.958-9.8c-5.444-4.356-7.622-8.712-7.622-16.334c0-6.534,3.267-13.068,8.712-17.423
c5.444-5.445,14.156-7.623,22.868-7.623c9.801,0,18.512,2.178,23.957,7.623c5.444,5.445,8.712,10.89,8.712,18.512l0,0h-15.246
c0-3.267-1.089-7.623-4.355-9.801c-2.178-2.178-6.534-3.267-11.979-3.267c-5.445,0-9.801,1.089-11.979,3.267
c-2.179,2.178-4.356,5.445-4.356,8.712c0,3.267,1.089,6.534,3.268,7.623c2.178,2.178,7.622,3.267,14.156,5.445
c10.89,2.178,18.513,5.445,23.957,9.801c6.534,4.356,8.712,9.801,8.712,16.335c0,7.622-3.267,14.156-9.801,18.512
c-6.533,4.356-14.156,7.623-23.957,7.623c-10.89,0-19.602-3.267-26.136-8.712c-6.533-5.444-9.801-11.979-8.712-19.601l0,0h15.246
c0,5.444,2.178,9.8,6.534,11.979c4.355,2.178,8.711,4.355,14.156,4.355c5.444,0,9.801-1.089,13.067-3.267
C594.576,421.046,596.755,417.779,596.755,414.513z"/>
</g>
</svg>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -7,12 +7,13 @@
<c:when test="${requestContext.theme.name eq 'all'}">
<link href="<c:url value="/html/1/styles/bootstrap.min.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/other.min.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/genesys.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/genesys.min.css" />" type="text/css" rel="stylesheet" />
</c:when>
<c:otherwise>
<link href="<c:url value="/html/1/styles/bootstrap.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/other.min.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/genesys.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/welcome.css" />" type="text/css" rel="stylesheet" />
</c:otherwise>
</c:choose>
......@@ -5,37 +5,35 @@
<footer class="footer">
<div class="container-fluid">
<!-- <p class="text-muted">Place sticky footer content here.</p> -->
<div class="footer-logo">
<a href="/1/welcome"><img src="/html/1/images/GENESYS-ICON.svg"
alt="Genesys - Gateway to Genetic Resources" /><img
src="/html/1/images/GENESYS-LOGO_black.svg"
alt="Genesys - Gateway to Genetic Resources" /></a>
</div>
<div id="nav-foot" class="clearfix">
<ul class="nav pull-left">
<li><a href="<c:url value="/1/content/about/about" />"><spring:message code="menu.about" /></a></li>
<li><a href="<c:url value="/1/content/about/contact" />"><spring:message code="menu.contact" /></a></li>
<li><a href="<c:url value="/1/content/legal/disclaimer" />"><spring:message code="menu.disclaimer" /></a></li>
<li><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/issues/new"><spring:message code="menu.report-an-issue" /></a></li>
<li class="notimportant"><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server.git"><spring:message code="menu.scm" /></a></li>
<li class="notimportant"><a target="_blank" href="https://www.transifex.com/crop-trust/genesys/"><spring:message code="menu.translate" /></a></li>
</ul>
<ul class="nav pull-right">
<li><a href="<c:url value="/1/content/legal/terms" />"><spring:message code="menu.terms" /></a></li>
<li><a href="<c:url value="/1/content/legal/copying" />"><spring:message code="menu.copying" /></a></li>
<li><a href="<c:url value="/1/content/legal/privacy" />"><spring:message code="menu.privacy" /></a></li>
</ul>
</div>
<ul class="nav text-center">
<li><a href="<c:url value="/1/content/about/about" />"><spring:message code="menu.about" /></a></li>
<li><a href="<c:url value="/1/content/about/contact" />"><spring:message code="menu.contact" /></a></li>
<li><a href="<c:url value="/1/content/legal/disclaimer" />"><spring:message code="menu.disclaimer" /></a></li>
<li><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/issues/new"><spring:message code="menu.report-an-issue" /></a></li>
<li class="notimportant"><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server.git"><spring:message code="menu.scm" /></a></li>
<li class="notimportant"><a target="_blank" href="https://www.transifex.com/crop-trust/genesys/"><spring:message code="menu.translate" /></a></li>
<li><a href="<c:url value="/1/content/legal/terms" />"><spring:message code="menu.terms" /></a></li>
<li><a href="<c:url value="/1/content/legal/copying" />"><spring:message code="menu.copying" /></a></li>
<li><a href="<c:url value="/1/content/legal/privacy" />"><spring:message code="menu.privacy" /></a></li>
</ul>
<div class="pull-left" id="copyright">
<a href="<c:url value="/1/welcome" />" class="pull-left"><img style="height: 30px" src="<c:url value="/html/0/images/logo.svg" />" alt="Genesys - Gateway to Genetic Resources" /></a>
<p class="pull-left"><spring:message code="footer.copyright-statement" /></p>
</div>
<div class="pull-right">
<div class="pull-left text-right" style="color: #808080; font-family: monospace; font-size: 8px;">
<div class="text-center" id="copyright">
<p><spring:message code="footer.copyright-statement" /></p>
</div>
<div class="text-center footer-link">
<spring:message code="page.rendertime" arguments="${springExecuteTime}" />
<br />
<a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/commits/${buildRevision}">${buildName}</a>
</div>
</div>
</div>
</footer>
......
<%@include file="/WEB-INF/jsp/init.jsp"%>
<div class="welcome-page">
<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-inverse navbar-fixed-top">
<div class="container-fluid">
......@@ -10,10 +11,10 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<c:url value="/1/welcome" />"><spring:message code="page.home.title" /></a>
<a class="navbar-brand nav-logo clearfix" href="/1/welcome"><img src="/html/1/images/GENESYS-ICON.svg" /><img src="/html/1/images/GENESYS-LOGO.svg" /></a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<ul class="nav navbar-nav nav-menu">
<li class="hidden-sm">
<a href="<c:url value="/1/welcome" />" title="<spring:message code="menu.home" />">
<spring:message code="menu.home" />
......@@ -223,10 +224,22 @@
</li>
</security:authorize>
</ul>
</div>
<div class="header-search">
<form action="/1/acn/search2" class="form-inline">
<div class="form-group">
<input type="text" name="q" class="form-control"
placeholder="Search Genesys..." /> <input type="submit"
class="btn btn-primary" value="" />
</div>
</form>
</div>
</div>
<!--/.nav-collapse -->
</div>
</nav>
</div>
<form id="logoutForm" action="/logout" method="post">
<input type="hidden"
......
......@@ -7,7 +7,7 @@
<head>
<title><spring:message code="page.home.title" /></title>
</head>
<body class="entry-page">
<body class="welcome-page">
<div class="row no-space intro">
<div class="hidden-xs col-sm-6">
<div class="intro-image">
......
Markdown is supported
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