From 16fc8d7210b2e7e1141170ab93d50311a2e058ca Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Wed, 18 Dec 2013 16:43:50 +0000 Subject: [PATCH] Improve webapp appearance --- server/compbio/controllers/IPDataController.java | 2 +- server/compbio/controllers/UserController.java | 5 +- webapp/resources/images/uod_logo_transparent.png | Bin 0 -> 31951 bytes webapp/resources/images/uod_logo_transparent.svg | 784 ++++++++++++++++++++++ webapp/resources/js/modernizr.271.custom.js | 4 + webapp/view/fragments/header.jsp | 2 + webapp/view/fragments/header_database.jsp | 3 + webapp/view/fragments/logos.jsp | 32 +- webapp/view/fragments/mainmenu.jsp | 2 + webapp/view/login.jsp | 2 +- webapp/view/reportJobLog.jsp | 5 +- webapp/view/reportProteinSequences.jsp | 4 +- webapp/view/support/Blocked.jsp | 1 - webapp/view/support/Denied.jsp | 1 - webapp/view/support/Notimplemented.jsp | 3 +- 15 files changed, 831 insertions(+), 19 deletions(-) create mode 100644 webapp/resources/images/uod_logo_transparent.png create mode 100644 webapp/resources/images/uod_logo_transparent.svg create mode 100644 webapp/resources/js/modernizr.271.custom.js diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java index 7c17a7f..ae3ca75 100644 --- a/server/compbio/controllers/IPDataController.java +++ b/server/compbio/controllers/IPDataController.java @@ -21,7 +21,7 @@ public class IPDataController extends BasicController { @RequestMapping(value = "/admin/ip/counts/query", method = RequestMethod.GET) public String initStatisticsForm(Map model) { - model.put("username", "name:" + getPrincipalName()); + model.put("username", getPrincipalName()); model.put("value", 5); return "query/IPStatistics"; } diff --git a/server/compbio/controllers/UserController.java b/server/compbio/controllers/UserController.java index 56b7087..01d24ac 100644 --- a/server/compbio/controllers/UserController.java +++ b/server/compbio/controllers/UserController.java @@ -5,8 +5,6 @@ import java.util.regex.Pattern; import javax.naming.directory.DirContext; -import org.springframework.ldap.core.LdapTemplate; -import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.mail.SimpleMailMessage; @@ -44,6 +42,7 @@ public class UserController { @RequestMapping(value = "/register/edit/query", method = RequestMethod.GET) public String AccountForm(ModelMap model) { + /* User user = new User(); user.setFullName("Sasha Sherstnev"); user.setEmail("admin@admin.com"); @@ -52,6 +51,8 @@ public class UserController { user.setUpdateByEmail(true); model.addAttribute("u", user); return "Edit"; + */ + return "support/Notimplemented"; } @RequestMapping(value = "/register/do", method = RequestMethod.POST) diff --git a/webapp/resources/images/uod_logo_transparent.png b/webapp/resources/images/uod_logo_transparent.png new file mode 100644 index 0000000000000000000000000000000000000000..02737fd25412a9e7e59548e2e6f4f3ba67f1b46a GIT binary patch literal 31951 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 literal 0 HcmV?d00001 diff --git a/webapp/resources/images/uod_logo_transparent.svg b/webapp/resources/images/uod_logo_transparent.svg new file mode 100644 index 0000000..debf506 --- /dev/null +++ b/webapp/resources/images/uod_logo_transparent.svg @@ -0,0 +1,784 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/resources/js/modernizr.271.custom.js b/webapp/resources/js/modernizr.271.custom.js new file mode 100644 index 0000000..aa15498 --- /dev/null +++ b/webapp/resources/js/modernizr.271.custom.js @@ -0,0 +1,4 @@ +/* Modernizr 2.7.1 (Custom Build) | MIT & BSD + * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexboxlegacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-canvas-canvastext-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-cssclasses-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load + */ +;window.Modernizr=function(a,b,c){function C(a){j.cssText=a}function D(a,b){return C(n.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a){var e=a[d];if(!F(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),H(e,b,c))}var d="2.7.1",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["­",'"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return I("flexWrap")},s.flexboxlegacy=function(){return I("boxDirection")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.rgba=function(){return C("background-color:rgba(150,255,150,.5)"),F(j.backgroundColor,"rgba")},s.hsla=function(){return C("background-color:hsla(120,40%,100%,.5)"),F(j.backgroundColor,"rgba")||F(j.backgroundColor,"hsla")},s.multiplebgs=function(){return C("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return I("backgroundSize")},s.borderimage=function(){return I("borderImage")},s.borderradius=function(){return I("borderRadius")},s.boxshadow=function(){return I("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return D("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return I("animationName")},s.csscolumns=function(){return I("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return C((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),F(j.backgroundImage,"gradient")},s.cssreflections=function(){return I("boxReflect")},s.csstransforms=function(){return!!I("transform")},s.csstransforms3d=function(){var a=!!I("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return I("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var J in s)B(s,J)&&(x=J.toLowerCase(),e[x]=s[J](),v.push((e[x]?"":"no-")+x));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)B(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},C(""),i=k=null,function(a,b){function l(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function m(){var a=s.elements;return typeof a=="string"?a.split(" "):a}function n(a){var b=j[a[h]];return b||(b={},i++,a[h]=i,j[i]=b),b}function o(a,c,d){c||(c=b);if(k)return c.createElement(a);d||(d=n(c));var g;return d.cache[a]?g=d.cache[a].cloneNode():f.test(a)?g=(d.cache[a]=d.createElem(a)).cloneNode():g=d.createElem(a),g.canHaveChildren&&!e.test(a)&&!g.tagUrn?d.frag.appendChild(g):g}function p(a,c){a||(a=b);if(k)return a.createDocumentFragment();c=c||n(a);var d=c.frag.cloneNode(),e=0,f=m(),g=f.length;for(;e",g="hidden"in a,k=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){g=!0,k=!0}})();var s={elements:d.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:c,shivCSS:d.shivCSS!==!1,supportsUnknownElements:k,shivMethods:d.shivMethods!==!1,type:"default",shivDocument:r,createElement:o,createDocumentFragment:p};a.html5=s,r(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.hasEvent=z,e.testProp=function(a){return G([a])},e.testAllProps=I,e.testStyles=y,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f + + diff --git a/webapp/view/fragments/header_database.jsp b/webapp/view/fragments/header_database.jsp index 151b39a..737638f 100644 --- a/webapp/view/fragments/header_database.jsp +++ b/webapp/view/fragments/header_database.jsp @@ -14,11 +14,14 @@ + + + + + ProteoCache 0.5 - Long Logo + + + - - diff --git a/webapp/view/fragments/mainmenu.jsp b/webapp/view/fragments/mainmenu.jsp index adaf956..f0a8904 100644 --- a/webapp/view/fragments/mainmenu.jsp +++ b/webapp/view/fragments/mainmenu.jsp @@ -25,7 +25,9 @@
  • ">Daily Job Statistics
  • ">Job Time Execution
    • +
  • ">IPs by Job count
    • +
  • ">Proteins by Job count
    • diff --git a/webapp/view/login.jsp b/webapp/view/login.jsp index 38e9ec8..32258d3 100644 --- a/webapp/view/login.jsp +++ b/webapp/view/login.jsp @@ -24,7 +24,7 @@
    - +

    diff --git a/webapp/view/reportJobLog.jsp b/webapp/view/reportJobLog.jsp index 846cde9..3772fbb 100644 --- a/webapp/view/reportJobLog.jsp +++ b/webapp/view/reportJobLog.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> -<%@page import="java.util.ArrayList"%> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> @@ -21,8 +21,9 @@

    Start timestamp : ${result.dateStart}

    End timestamp : ${result.dateEnd}

    +

    IP: ${result.ip}

    - +     diff --git a/webapp/view/reportProteinSequences.jsp b/webapp/view/reportProteinSequences.jsp index 668d653..c6be974 100644 --- a/webapp/view/reportProteinSequences.jsp +++ b/webapp/view/reportProteinSequences.jsp @@ -51,9 +51,7 @@ href="${job_query}?IdJob=${id}">${id} - +
    Protein - SequenceProtein Sequence <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> diff --git a/webapp/view/support/Denied.jsp b/webapp/view/support/Denied.jsp index 0a27337..6e2b380 100644 --- a/webapp/view/support/Denied.jsp +++ b/webapp/view/support/Denied.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> diff --git a/webapp/view/support/Notimplemented.jsp b/webapp/view/support/Notimplemented.jsp index 2afcd43..2bdc1e3 100644 --- a/webapp/view/support/Notimplemented.jsp +++ b/webapp/view/support/Notimplemented.jsp @@ -1,4 +1,3 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> @@ -23,7 +22,7 @@
    The page is not available...
    -

    The functionality is not implemeted

    +

    The functionality is not implemented yet

    -- 1.7.10.2