Changeset 6196 for SRUAggregator


Ignore:
Timestamp:
05/11/15 19:13:33 (9 years ago)
Author:
emanuel.dima@uni-tuebingen.de
Message:
  1. beta-48: fixed double click on clarin services button, added people to about page, and misc
Location:
SRUAggregator/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • SRUAggregator/trunk/pom.xml

    r6182 r6196  
    88        <groupId>eu.clarin.sru.fcs</groupId>
    99        <artifactId>aggregator</artifactId>
    10         <version>2.0.0-beta-47</version>
     10        <version>2.0.0-beta-48</version>
    1111        <name>FCS Aggregator</name>
    1212

  • SRUAggregator/trunk/src/main/resources/assets/clarinservices/clarinservices.css

    r6181 r6196  
    44}
    55
    6 #clarinservices button.dropdown-toggle {
     6#clarinservices button.clarinservices-dropdown-toggle {
    77        background-color: transparent;
    88        padding: 4px 4px;
    99}
    1010
    11 #clarinservices button.dropdown-toggle img{
     11#clarinservices button.clarinservices-dropdown-toggle img{
    1212  width: 24px;
    1313  height: 24px;
    1414}
    1515
    16 #clarinservices ul.dropdown-menu {
     16#clarinservices ul.clarinservices-dropdown-menu {
    1717  border-radius: 50px;
    1818  border-top-left-radius: 0;
    … …  
    2121}
    2222@media (min-width: 768px) {
    23   #clarinservices ul.dropdown-menu {
     23  #clarinservices ul.clarinservices-dropdown-menu {
    2424    width: 483px;
    2525  }
    2626}
    2727
    28 .navbar-right #clarinservices ul.dropdown-menu {
     28.navbar-right #clarinservices ul.clarinservices-dropdown-menu {
    2929  border-top-left-radius: 50px;
    3030  border-top-right-radius: 0;
    … …  
    8888/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
    8989
    90 #clarinservices .sr-only {
     90#clarinservices .clarinservices-sr-only {
    9191  position: absolute;
    9292  width: 1px;
    … …  
    9999}
    100100
    101 #clarinservices .sr-only-focusable:active,
    102 #clarinservices .sr-only-focusable:focus {
     101#clarinservices .clarinservices-sr-only-focusable:active,
     102#clarinservices .clarinservices-sr-only-focusable:focus {
    103103  position: static;
    104104  width: auto;
    … …  
    111111  cursor: pointer;
    112112}
    113 #clarinservices .caret {
     113#clarinservices .clarinservices-caret {
    114114  display: inline-block;
    115115  width: 0;
    … …  
    122122}
    123123
    124 #clarinservices .dropup,
    125 #clarinservices .dropdown {
     124#clarinservices .clarinservices-dropup,
     125#clarinservices .clarinservices-dropdown {
    126126  position: relative;
    127127}
    128 #clarinservices .dropdown-toggle:focus {
     128#clarinservices .clarinservices-dropdown-toggle:focus {
    129129  outline: 0;
    130130}
    131 #clarinservices .dropdown-menu {
     131#clarinservices .clarinservices-dropdown-menu {
    132132  position: absolute;
    133133  top: 100%;
    … …  
    151151          background-clip: padding-box;
    152152}
    153 #clarinservices .dropdown-menu.pull-right {
     153#clarinservices .clarinservices-dropdown-menu.pull-right {
    154154  right: 0;
    155155  left: auto;
    156156}
    157 #clarinservices .dropdown-menu .divider {
     157#clarinservices .clarinservices-dropdown-menu .divider {
    158158  height: 1px;
    159159  margin: 9px 0;
    … …  
    161161  background-color: #e5e5e5;
    162162}
    163 #clarinservices .dropdown-menu > li > a {
     163#clarinservices .clarinservices-dropdown-menu > li > a {
    164164  display: block;
    165165  padding: 3px 20px;
    … …  
    170170  white-space: nowrap;
    171171}
    172 #clarinservices .dropdown-menu > li > a:hover,
    173 #clarinservices .dropdown-menu > li > a:focus {
     172#clarinservices .clarinservices-dropdown-menu > li > a:hover,
     173#clarinservices .clarinservices-dropdown-menu > li > a:focus {
    174174  text-decoration: none;
    175175  color: #262626;
    176176  background-color: #f5f5f5;
    177177}
    178 #clarinservices .dropdown-menu > .active > a,
    179 #clarinservices .dropdown-menu > .active > a:hover,
    180 #clarinservices .dropdown-menu > .active > a:focus {
     178#clarinservices .clarinservices-dropdown-menu > .active > a,
     179#clarinservices .clarinservices-dropdown-menu > .active > a:hover,
     180#clarinservices .clarinservices-dropdown-menu > .active > a:focus {
    181181  color: #ffffff;
    182182  text-decoration: none;
    … …  
    184184  background-color: #337ab7;
    185185}
    186 #clarinservices .dropdown-menu > .disabled > a,
    187 #clarinservices .dropdown-menu > .disabled > a:hover,
    188 #clarinservices .dropdown-menu > .disabled > a:focus {
     186#clarinservices .clarinservices-dropdown-menu > .disabled > a,
     187#clarinservices .clarinservices-dropdown-menu > .disabled > a:hover,
     188#clarinservices .clarinservices-dropdown-menu > .disabled > a:focus {
    189189  color: #777777;
    190190}
    191 #clarinservices .dropdown-menu > .disabled > a:hover,
    192 #clarinservices .dropdown-menu > .disabled > a:focus {
     191#clarinservices .clarinservices-dropdown-menu > .disabled > a:hover,
     192#clarinservices .clarinservices-dropdown-menu > .disabled > a:focus {
    193193  text-decoration: none;
    194194  background-color: transparent;
    … …  
    197197  cursor: not-allowed;
    198198}
    199 #clarinservices .open > .dropdown-menu {
    200   display: block;
    201 }
    202 #clarinservices .open > a {
     199#clarinservices .clarinservices-open > .clarinservices-dropdown-menu {
     200  display: block;
     201}
     202#clarinservices .clarinservices-open > a {
    203203  outline: 0;
    204204}
    205 #clarinservices .dropdown-menu-right {
     205#clarinservices .clarinservices-dropdown-menu-right {
    206206  left: auto;
    207207  right: 0;
    208208}
    209 #clarinservices .dropdown-menu-left {
     209#clarinservices .clarinservices-dropdown-menu-left {
    210210  left: 0;
    211211  right: auto;
    212212}
    213 #clarinservices .dropdown-header {
     213#clarinservices .clarinservices-dropdown-header {
    214214  display: block;
    215215  padding: 3px 20px;
    … …  
    219219  white-space: nowrap;
    220220}
    221 #clarinservices .dropdown-backdrop {
     221#clarinservices .clarinservices-dropdown-backdrop {
    222222  position: fixed;
    223223  left: 0;
    … …  
    227227  z-index: 990;
    228228}
    229 #clarinservices .pull-right > .dropdown-menu {
     229#clarinservices .clarinservices-pull-right > .clarinservices-dropdown-menu {
    230230  right: 0;
    231231  left: auto;
    232232}
    233 #clarinservices .dropup .caret,
    234 #clarinservices .navbar-fixed-bottom .dropdown .caret {
     233#clarinservices .clarinservices-dropup .clarinservices-caret,
     234#clarinservices .clarinservices-navbar-fixed-bottom .clarinservices-dropdown .clarinservices-caret {
    235235  border-top: 0;
    236236  border-bottom: 4px solid;
    237237  content: "";
    238238}
    239 #clarinservices .dropup .dropdown-menu,
    240 #clarinservices .navbar-fixed-bottom .dropdown .dropdown-menu {
     239#clarinservices .clarinservices-dropup .clarinservices-dropdown-menu,
     240#clarinservices .clarinservices-navbar-fixed-bottom .clarinservices-dropdown .clarinservices-dropdown-menu {
    241241  top: auto;
    242242  bottom: 100%;
    … …  
    244244}
    245245@media (min-width: 768px) {
    246   .navbar-right #clarinservices .dropdown-menu {
     246  .navbar-right #clarinservices .clarinservices-dropdown-menu {
    247247    left: auto;
    248248    right: 0;
    249249  }
    250   .navbar-right #clarinservices .dropdown-menu-left {
     250  .navbar-right #clarinservices .clarinservices-dropdown-menu-left {
    251251    left: 0;
    252252    right: auto;
    253253  }
    254254}
    255 #clarinservices .clearfix:before,
    256 #clarinservices .clearfix:after {
     255#clarinservices .clarinservices-clearfix:before,
     256#clarinservices .clarinservices-clearfix:after {
    257257  content: " ";
    258258  display: table;
    259259}
    260 #clarinservices .clearfix:after {
     260#clarinservices .clarinservices-clearfix:after {
    261261  clear: both;
    262262}
    263 #clarinservices .center-block {
     263#clarinservices .clarinservices-center-block {
    264264  display: block;
    265265  margin-left: auto;
    266266  margin-right: auto;
    267267}
    268 #clarinservices .pull-right {
     268#clarinservices .clarinservices-pull-right {
    269269  float: right !important;
    270270}
    271 #clarinservices .pull-left {
     271#clarinservices .clarinservices-pull-left {
    272272  float: left !important;
    273273}
    274 #clarinservices .hide {
     274#clarinservices .clarinservices-hide {
    275275  display: none !important;
    276276}
    277 #clarinservices .show {
     277#clarinservices .clarinservices-show {
    278278  display: block !important;
    279279}
    280 #clarinservices .invisible {
     280#clarinservices .clarinservices-invisible {
    281281  visibility: hidden;
    282282}
    283 #clarinservices .text-hide {
     283#clarinservices .clarinservices-text-hide {
    284284  font: 0/0 a;
    285285  color: transparent;
    … …  
    288288  border: 0;
    289289}
    290 #clarinservices .hidden {
     290#clarinservices .clarinservices-hidden {
    291291  display: none !important;
    292292}
    293 #clarinservices .affix {
     293#clarinservices .clarinservices-affix {
    294294  position: fixed;
    295295}

  • SRUAggregator/trunk/src/main/resources/assets/clarinservices/clarinservices.js

    r6182 r6196  
    8888        var a = $('<a>').attr('href', service.href).append(div);
    8989        var li = $('<li>').attr('title', escapeHtml(service.description)).append(a);
    90         console.log(li);
    9190        return li;
    9291}
    … …  
    9695        var img = $('<img>').attr('src', more_button_img_data);
    9796
    98         var imgdiv = $('<div>').attr('id', 'clarinmore').append(img);
     97        var imgdiv = $('<div>').append(img);
    9998        var button = $('<button>').attr({
    100                 'class': 'btn dropdown-toggle',
    101                 type: 'button',
    102                 id:"dropdown-clarinservices",
    103                 'data-toggle': "dropdown",
     99                'class': 'btn clarinservices-dropdown-toggle',
     100                'type': 'button',
     101                'id':"dropdown-clarinservices",
     102                'data-toggle': "clarinservices-dropdown",
    104103                'aria-expanded':"true"
    105104        }).append(imgdiv);
    106105
    107106        var ul = $('<ul>').attr({
    108                 'class': 'dropdown-menu',
    109                 role: 'menu',
     107                'class': 'clarinservices-dropdown-menu',
     108                'role': 'menu',
    110109                "aria-labelledby": "dropdown-clarinservices"
    111110        });
    112111        service_list.map(renderCell).forEach(function(x){x.appendTo(ul);});
    113112
    114         return $('<div>').attr('class', 'dropdown').append(button).append(ul);
     113        return $('<div>').attr('class', 'clarinservices-dropdown').append(button).append(ul);
    115114}
    116115
    … …  
    120119                $(csdiv).append(renderDropdown(service_list));
    121120                $(csdiv).children().each(function (x) {
    122                         $(x).data('bs.dropdown', new Dropdown(x));
     121                        $(x).data('bs.clarinservices-dropdown', new Dropdown(x));
    123122                });
    124123        } else if (console && console.warn) {
    … …  
    139138var Zepto=function(){function L(t){return null==t?String(t):j[S.call(t)]||"object"}function Z(t){return"function"==L(t)}function _(t){return null!=t&&t==t.window}function $(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function D(t){return"object"==L(t)}function M(t){return D(t)&&!_(t)&&Object.getPrototypeOf(t)==Object.prototype}function R(t){return"number"==typeof t.length}function k(t){return s.call(t,function(t){return null!=t})}function z(t){return t.length>0?n.fn.concat.apply([],t):t}function F(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function q(t){return t in f?f[t]:f[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function H(t,e){return"number"!=typeof e||c[F(t)]?e:e+"px"}function I(t){var e,n;return u[t]||(e=a.createElement(t),a.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),u[t]=n),u[t]}function V(t){return"children"in t?o.call(t.children):n.map(t.childNodes,function(t){return 1==t.nodeType?t:void 0})}function B(n,i,r){for(e in i)r&&(M(i[e])||A(i[e]))?(M(i[e])&&!M(n[e])&&(n[e]={}),A(i[e])&&!A(n[e])&&(n[e]=[]),B(n[e],i[e],r)):i[e]!==t&&(n[e]=i[e])}function U(t,e){return null==e?n(t):n(t).filter(e)}function J(t,e,n,i){return Z(e)?e.call(t,n,i):e}function X(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function W(e,n){var i=e.className||"",r=i&&i.baseVal!==t;return n===t?r?i.baseVal:i:void(r?i.baseVal=n:e.className=n)}function Y(t){try{return t?"true"==t||("false"==t?!1:"null"==t?null:+t+""==t?+t:/^[\[\{]/.test(t)?n.parseJSON(t):t):t}catch(e){return t}}function G(t,e){e(t);for(var n=0,i=t.childNodes.length;i>n;n++)G(t.childNodes[n],e)}var t,e,n,i,C,N,r=[],o=r.slice,s=r.filter,a=window.document,u={},f={},c={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},l=/^\s*<(\w+|!)[^>]*>/,h=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,p=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,d=/^(?:body|html)$/i,m=/([A-Z])/g,g=["val","css","html","text","data","width","height","offset"],v=["after","prepend","before","append"],y=a.createElement("table"),x=a.createElement("tr"),b={tr:a.createElement("tbody"),tbody:y,thead:y,tfoot:y,td:x,th:x,"*":a.createElement("div")},w=/complete|loaded|interactive/,E=/^[\w-]*$/,j={},S=j.toString,T={},O=a.createElement("div"),P={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},A=Array.isArray||function(t){return t instanceof Array};return T.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var i,r=t.parentNode,o=!r;return o&&(r=O).appendChild(t),i=~T.qsa(r,e).indexOf(t),o&&O.removeChild(t),i},C=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},N=function(t){return s.call(t,function(e,n){return t.indexOf(e)==n})},T.fragment=function(e,i,r){var s,u,f;return h.test(e)&&(s=n(a.createElement(RegExp.$1))),s||(e.replace&&(e=e.replace(p,"<$1></$2>")),i===t&&(i=l.test(e)&&RegExp.$1),i in b||(i="*"),f=b[i],f.innerHTML=""+e,s=n.each(o.call(f.childNodes),function(){f.removeChild(this)})),M(r)&&(u=n(s),n.each(r,function(t,e){g.indexOf(t)>-1?u[t](e):u.attr(t,e)})),s},T.Z=function(t,e){return t=t||[],t.__proto__=n.fn,t.selector=e||"",t},T.isZ=function(t){return t instanceof T.Z},T.init=function(e,i){var r;if(!e)return T.Z();if("string"==typeof e)if(e=e.trim(),"<"==e[0]&&l.test(e))r=T.fragment(e,RegExp.$1,i),e=null;else{if(i!==t)return n(i).find(e);r=T.qsa(a,e)}else{if(Z(e))return n(a).ready(e);if(T.isZ(e))return e;if(A(e))r=k(e);else if(D(e))r=[e],e=null;else if(l.test(e))r=T.fragment(e.trim(),RegExp.$1,i),e=null;else{if(i!==t)return n(i).find(e);r=T.qsa(a,e)}}return T.Z(r,e)},n=function(t,e){return T.init(t,e)},n.extend=function(t){var e,n=o.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){B(t,n,e)}),t},T.qsa=function(t,e){var n,i="#"==e[0],r=!i&&"."==e[0],s=i||r?e.slice(1):e,a=E.test(s);return $(t)&&a&&i?(n=t.getElementById(s))?[n]:[]:1!==t.nodeType&&9!==t.nodeType?[]:o.call(a&&!i?r?t.getElementsByClassName(s):t.getElementsByTagName(e):t.querySelectorAll(e))},n.contains=a.documentElement.contains?function(t,e){return t!==e&&t.contains(e)}:function(t,e){for(;e&&(e=e.parentNode);)if(e===t)return!0;return!1},n.type=L,n.isFunction=Z,n.isWindow=_,n.isArray=A,n.isPlainObject=M,n.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},n.inArray=function(t,e,n){return r.indexOf.call(e,t,n)},n.camelCase=C,n.trim=function(t){return null==t?"":String.prototype.trim.call(t)},n.uuid=0,n.support={},n.expr={},n.map=function(t,e){var n,r,o,i=[];if(R(t))for(r=0;r<t.length;r++)n=e(t[r],r),null!=n&&i.push(n);else for(o in t)n=e(t[o],o),null!=n&&i.push(n);return z(i)},n.each=function(t,e){var n,i;if(R(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(i in t)if(e.call(t[i],i,t[i])===!1)return t;return t},n.grep=function(t,e){return s.call(t,e)},window.JSON&&(n.parseJSON=JSON.parse),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){j["[object "+e+"]"]=e.toLowerCase()}),n.fn={forEach:r.forEach,reduce:r.reduce,push:r.push,sort:r.sort,indexOf:r.indexOf,concat:r.concat,map:function(t){return n(n.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return n(o.apply(this,arguments))},ready:function(t){return w.test(a.readyState)&&a.body?t(n):a.addEventListener("DOMContentLoaded",function(){t(n)},!1),this},get:function(e){return e===t?o.call(this):this[e>=0?e:e+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return r.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return Z(t)?this.not(this.not(t)):n(s.call(this,function(e){return T.matches(e,t)}))},add:function(t,e){return n(N(this.concat(n(t,e))))},is:function(t){return this.length>0&&T.matches(this[0],t)},not:function(e){var i=[];if(Z(e)&&e.call!==t)this.each(function(t){e.call(this,t)||i.push(this)});else{var r="string"==typeof e?this.filter(e):R(e)&&Z(e.item)?o.call(e):n(e);this.forEach(function(t){r.indexOf(t)<0&&i.push(t)})}return n(i)},has:function(t){return this.filter(function(){return D(t)?n.contains(this,t):n(this).find(t).size()})},eq:function(t){return-1===t?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!D(t)?t:n(t)},last:function(){var t=this[this.length-1];return t&&!D(t)?t:n(t)},find:function(t){var e,i=this;return e=t?"object"==typeof t?n(t).filter(function(){var t=this;return r.some.call(i,function(e){return n.contains(e,t)})}):1==this.length?n(T.qsa(this[0],t)):this.map(function(){return T.qsa(this,t)}):n()},closest:function(t,e){var i=this[0],r=!1;for("object"==typeof t&&(r=n(t));i&&!(r?r.indexOf(i)>=0:T.matches(i,t));)i=i!==e&&!$(i)&&i.parentNode;return n(i)},parents:function(t){for(var e=[],i=this;i.length>0;)i=n.map(i,function(t){return(t=t.parentNode)&&!$(t)&&e.indexOf(t)<0?(e.push(t),t):void 0});return U(e,t)},parent:function(t){return U(N(this.pluck("parentNode")),t)},children:function(t){return U(this.map(function(){return V(this)}),t)},contents:function(){return this.map(function(){return o.call(this.childNodes)})},siblings:function(t){return U(this.map(function(t,e){return s.call(V(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return n.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=I(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var e=Z(t);if(this[0]&&!e)var i=n(t).get(0),r=i.parentNode||this.length>1;return this.each(function(o){n(this).wrapAll(e?t.call(this,o):r?i.cloneNode(!0):i)})},wrapAll:function(t){if(this[0]){n(this[0]).before(t=n(t));for(var e;(e=t.children()).length;)t=e.first();n(t).append(this)}return this},wrapInner:function(t){var e=Z(t);return this.each(function(i){var r=n(this),o=r.contents(),s=e?t.call(this,i):t;o.length?o.wrapAll(s):r.append(s)})},unwrap:function(){return this.parent().each(function(){n(this).replaceWith(n(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(e){return this.each(function(){var i=n(this);(e===t?"none"==i.css("display"):e)?i.show():i.hide()})},prev:function(t){return n(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return n(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0 in arguments?this.each(function(e){var i=this.innerHTML;n(this).empty().append(J(this,t,e,i))}):0 in this?this[0].innerHTML:null},text:function(t){return 0 in arguments?this.each(function(e){var n=J(this,t,e,this.textContent);this.textContent=null==n?"":""+n}):0 in this?this[0].textContent:null},attr:function(n,i){var r;return"string"!=typeof n||1 in arguments?this.each(function(t){if(1===this.nodeType)if(D(n))for(e in n)X(this,e,n[e]);else X(this,n,J(this,i,t,this.getAttribute(n)))}):this.length&&1===this[0].nodeType?!(r=this[0].getAttribute(n))&&n in this[0]?this[0][n]:r:t},removeAttr:function(t){return this.each(function(){1===this.nodeType&&t.split(" ").forEach(function(t){X(this,t)},this)})},prop:function(t,e){return t=P[t]||t,1 in arguments?this.each(function(n){this[t]=J(this,e,n,this[t])}):this[0]&&this[0][t]},data:function(e,n){var i="data-"+e.replace(m,"-$1").toLowerCase(),r=1 in arguments?this.attr(i,n):this.attr(i);return null!==r?Y(r):t},val:function(t){return 0 in arguments?this.each(function(e){this.value=J(this,t,e,this.value)}):this[0]&&(this[0].multiple?n(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value)},offset:function(t){if(t)return this.each(function(e){var i=n(this),r=J(this,t,e,i.offset()),o=i.offsetParent().offset(),s={top:r.top-o.top,left:r.left-o.left};"static"==i.css("position")&&(s.position="relative"),i.css(s)});if(!this.length)return null;var e=this[0].getBoundingClientRect();return{left:e.left+window.pageXOffset,top:e.top+window.pageYOffset,width:Math.round(e.width),height:Math.round(e.height)}},css:function(t,i){if(arguments.length<2){var r,o=this[0];if(!o)return;if(r=getComputedStyle(o,""),"string"==typeof t)return o.style[C(t)]||r.getPropertyValue(t);if(A(t)){var s={};return n.each(t,function(t,e){s[e]=o.style[C(e)]||r.getPropertyValue(e)}),s}}var a="";if("string"==L(t))i||0===i?a=F(t)+":"+H(t,i):this.each(function(){this.style.removeProperty(F(t))});else for(e in t)t[e]||0===t[e]?a+=F(e)+":"+H(e,t[e])+";":this.each(function(){this.style.removeProperty(F(e))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(n(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return t?r.some.call(this,function(t){return this.test(W(t))},q(t)):!1},addClass:function(t){return t?this.each(function(e){if("className"in this){i=[];var r=W(this),o=J(this,t,e,r);o.split(/\s+/g).forEach(function(t){n(this).hasClass(t)||i.push(t)},this),i.length&&W(this,r+(r?" ":"")+i.join(" "))}}):this},removeClass:function(e){return this.each(function(n){if("className"in this){if(e===t)return W(this,"");i=W(this),J(this,e,n,i).split(/\s+/g).forEach(function(t){i=i.replace(q(t)," ")}),W(this,i.trim())}})},toggleClass:function(e,i){return e?this.each(function(r){var o=n(this),s=J(this,e,r,W(this));s.split(/\s+/g).forEach(function(e){(i===t?!o.hasClass(e):i)?o.addClass(e):o.removeClass(e)})}):this},scrollTop:function(e){if(this.length){var n="scrollTop"in this[0];return e===t?n?this[0].scrollTop:this[0].pageYOffset:this.each(n?function(){this.scrollTop=e}:function(){this.scrollTo(this.scrollX,e)})}},scrollLeft:function(e){if(this.length){var n="scrollLeft"in this[0];return e===t?n?this[0].scrollLeft:this[0].pageXOffset:this.each(n?function(){this.scrollLeft=e}:function(){this.scrollTo(e,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),i=this.offset(),r=d.test(e[0].nodeName)?{top:0,left:0}:e.offset();return i.top-=parseFloat(n(t).css("margin-top"))||0,i.left-=parseFloat(n(t).css("margin-left"))||0,r.top+=parseFloat(n(e[0]).css("border-top-width"))||0,r.left+=parseFloat(n(e[0]).css("border-left-width"))||0,{top:i.top-r.top,left:i.left-r.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||a.body;t&&!d.test(t.nodeName)&&"static"==n(t).css("position");)t=t.offsetParent;return t})}},n.fn.detach=n.fn.remove,["width","height"].forEach(function(e){var i=e.replace(/./,function(t){return t[0].toUpperCase()});n.fn[e]=function(r){var o,s=this[0];return r===t?_(s)?s["inner"+i]:$(s)?s.documentElement["scroll"+i]:(o=this.offset())&&o[e]:this.each(function(t){s=n(this),s.css(e,J(this,r,t,s[e]()))})}}),v.forEach(function(t,e){var i=e%2;n.fn[t]=function(){var t,o,r=n.map(arguments,function(e){return t=L(e),"object"==t||"array"==t||null==e?e:T.fragment(e)}),s=this.length>1;return r.length<1?this:this.each(function(t,u){o=i?u:u.parentNode,u=0==e?u.nextSibling:1==e?u.firstChild:2==e?u:null;var f=n.contains(a.documentElement,o);r.forEach(function(t){if(s)t=t.cloneNode(!0);else if(!o)return n(t).remove();o.insertBefore(t,u),f&&G(t,function(t){null==t.nodeName||"SCRIPT"!==t.nodeName.toUpperCase()||t.type&&"text/javascript"!==t.type||t.src||window.eval.call(window,t.innerHTML)})})})},n.fn[i?t+"To":"insert"+(e?"Before":"After")]=function(e){return n(e)[t](this),this}}),T.Z.prototype=n.fn,T.uniq=N,T.deserializeValue=Y,n.zepto=T,n}();window.Zepto=Zepto,void 0===window.$&&(window.$=Zepto),function(t){function l(t){return t._zid||(t._zid=e++)}function h(t,e,n,i){if(e=p(e),e.ns)var r=d(e.ns);return(s[l(t)]||[]).filter(function(t){return!(!t||e.e&&t.e!=e.e||e.ns&&!r.test(t.ns)||n&&l(t.fn)!==l(n)||i&&t.sel!=i)})}function p(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function d(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function m(t,e){return t.del&&!u&&t.e in f||!!e}function g(t){return c[t]||u&&f[t]||t}function v(e,i,r,o,a,u,f){var h=l(e),d=s[h]||(s[h]=[]);i.split(/\s/).forEach(function(i){if("ready"==i)return t(document).ready(r);var s=p(i);s.fn=r,s.sel=a,s.e in c&&(r=function(e){var n=e.relatedTarget;return!n||n!==this&&!t.contains(this,n)?s.fn.apply(this,arguments):void 0}),s.del=u;var l=u||r;s.proxy=function(t){if(t=j(t),!t.isImmediatePropagationStopped()){t.data=o;var i=l.apply(e,t._args==n?[t]:[t].concat(t._args));return i===!1&&(t.preventDefault(),t.stopPropagation()),i}},s.i=d.length,d.push(s),"addEventListener"in e&&e.addEventListener(g(s.e),s.proxy,m(s,f))})}function y(t,e,n,i,r){var o=l(t);(e||"").split(/\s/).forEach(function(e){h(t,e,n,i).forEach(function(e){delete s[o][e.i],"removeEventListener"in t&&t.removeEventListener(g(e.e),e.proxy,m(e,r))})})}function j(e,i){return(i||!e.isDefaultPrevented)&&(i||(i=e),t.each(E,function(t,n){var r=i[t];e[t]=function(){return this[n]=x,r&&r.apply(i,arguments)},e[n]=b}),(i.defaultPrevented!==n?i.defaultPrevented:"returnValue"in i?i.returnValue===!1:i.getPreventDefault&&i.getPreventDefault())&&(e.isDefaultPrevented=x)),e}function S(t){var e,i={originalEvent:t};for(e in t)w.test(e)||t[e]===n||(i[e]=t[e]);return j(i,t)}var n,e=1,i=Array.prototype.slice,r=t.isFunction,o=function(t){return"string"==typeof t},s={},a={},u="onfocusin"in window,f={focus:"focusin",blur:"focusout"},c={mouseenter:"mouseover",mouseleave:"mouseout"};a.click=a.mousedown=a.mouseup=a.mousemove="MouseEvents",t.event={add:v,remove:y},t.proxy=function(e,n){var s=2 in arguments&&i.call(arguments,2);if(r(e)){var a=function(){return e.apply(n,s?s.concat(i.call(arguments)):arguments)};return a._zid=l(e),a}if(o(n))return s?(s.unshift(e[n],e),t.proxy.apply(null,s)):t.proxy(e[n],e);throw new TypeError("expected function")},t.fn.bind=function(t,e,n){return this.on(t,e,n)},t.fn.unbind=function(t,e){return this.off(t,e)},t.fn.one=function(t,e,n,i){return this.on(t,e,n,i,1)};var x=function(){return!0},b=function(){return!1},w=/^([A-Z]|returnValue$|layer[XY]$)/,E={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};t.fn.delegate=function(t,e,n){return this.on(e,t,n)},t.fn.undelegate=function(t,e,n){return this.off(e,t,n)},t.fn.live=function(e,n){return t(document.body).delegate(this.selector,e,n),this},t.fn.die=function(e,n){return t(document.body).undelegate(this.selector,e,n),this},t.fn.on=function(e,s,a,u,f){var c,l,h=this;return e&&!o(e)?(t.each(e,function(t,e){h.on(t,s,a,e,f)}),h):(o(s)||r(u)||u===!1||(u=a,a=s,s=n),(r(a)||a===!1)&&(u=a,a=n),u===!1&&(u=b),h.each(function(n,r){f&&(c=function(t){return y(r,t.type,u),u.apply(this,arguments)}),s&&(l=function(e){var n,o=t(e.target).closest(s,r).get(0);return o&&o!==r?(n=t.extend(S(e),{currentTarget:o,liveFired:r}),(c||u).apply(o,[n].concat(i.call(arguments,1)))):void 0}),v(r,e,u,a,s,l||c)}))},t.fn.off=function(e,i,s){var a=this;return e&&!o(e)?(t.each(e,function(t,e){a.off(t,i,e)}),a):(o(i)||r(s)||s===!1||(s=i,i=n),s===!1&&(s=b),a.each(function(){y(this,e,s,i)}))},t.fn.trigger=function(e,n){return e=o(e)||t.isPlainObject(e)?t.Event(e):j(e),e._args=n,this.each(function(){e.type in f&&"function"==typeof this[e.type]?this[e.type]():"dispatchEvent"in this?this.dispatchEvent(e):t(this).triggerHandler(e,n)})},t.fn.triggerHandler=function(e,n){var i,r;return this.each(function(s,a){i=S(o(e)?t.Event(e):e),i._args=n,i.target=a,t.each(h(a,e.type||e),function(t,e){return r=e.proxy(i),i.isImmediatePropagationStopped()?!1:void 0})}),r},"focusin focusout focus blur load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(e){t.fn[e]=function(t){return 0 in arguments?this.bind(e,t):this.trigger(e)}}),t.Event=function(t,e){o(t)||(e=t,t=e.type);var n=document.createEvent(a[t]||"Events"),i=!0;if(e)for(var r in e)"bubbles"==r?i=!!e[r]:n[r]=e[r];return n.initEvent(t,i,!0),j(n)}}(Zepto),function(t){function h(e,n,i){var r=t.Event(n);return t(e).trigger(r,i),!r.isDefaultPrevented()}function p(t,e,i,r){return t.global?h(e||n,i,r):void 0}function d(e){e.global&&0===t.active++&&p(e,null,"ajaxStart")}function m(e){e.global&&!--t.active&&p(e,null,"ajaxStop")}function g(t,e){var n=e.context;return e.beforeSend.call(n,t,e)===!1||p(e,n,"ajaxBeforeSend",[t,e])===!1?!1:void p(e,n,"ajaxSend",[t,e])}function v(t,e,n,i){var r=n.context,o="success";n.success.call(r,t,o,e),i&&i.resolveWith(r,[t,o,e]),p(n,r,"ajaxSuccess",[e,n,t]),x(o,e,n)}function y(t,e,n,i,r){var o=i.context;i.error.call(o,n,e,t),r&&r.rejectWith(o,[n,e,t]),p(i,o,"ajaxError",[n,i,t||e]),x(e,n,i)}function x(t,e,n){var i=n.context;n.complete.call(i,e,t),p(n,i,"ajaxComplete",[e,n]),m(n)}function b(){}function w(t){return t&&(t=t.split(";",2)[0]),t&&(t==f?"html":t==u?"json":s.test(t)?"script":a.test(t)&&"xml")||"text"}function E(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function j(e){e.processData&&e.data&&"string"!=t.type(e.data)&&(e.data=t.param(e.data,e.traditional)),!e.data||e.type&&"GET"!=e.type.toUpperCase()||(e.url=E(e.url,e.data),e.data=void 0)}function S(e,n,i,r){return t.isFunction(n)&&(r=i,i=n,n=void 0),t.isFunction(i)||(r=i,i=void 0),{url:e,data:n,success:i,dataType:r}}function C(e,n,i,r){var o,s=t.isArray(n),a=t.isPlainObject(n);t.each(n,function(n,u){o=t.type(u),r&&(n=i?r:r+"["+(a||"object"==o||"array"==o?n:"")+"]"),!r&&s?e.add(u.name,u.value):"array"==o||!i&&"object"==o?C(e,u,i,n):e.add(n,u)})}var i,r,e=0,n=window.document,o=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,s=/^(?:text|application)\/javascript/i,a=/^(?:text|application)\/xml/i,u="application/json",f="text/html",c=/^\s*$/,l=n.createElement("a");l.href=window.location.href,t.active=0,t.ajaxJSONP=function(i,r){if(!("type"in i))return t.ajax(i);var f,h,o=i.jsonpCallback,s=(t.isFunction(o)?o():o)||"jsonp"+ ++e,a=n.createElement("script"),u=window[s],c=function(e){t(a).triggerHandler("error",e||"abort")},l={abort:c};return r&&r.promise(l),t(a).on("load error",function(e,n){clearTimeout(h),t(a).off().remove(),"error"!=e.type&&f?v(f[0],l,i,r):y(null,n||"error",l,i,r),window[s]=u,f&&t.isFunction(u)&&u(f[0]),u=f=void 0}),g(l,i)===!1?(c("abort"),l):(window[s]=function(){f=arguments},a.src=i.url.replace(/\?(.+)=\?/,"?$1="+s),n.head.appendChild(a),i.timeout>0&&(h=setTimeout(function(){c("timeout")},i.timeout)),l)},t.ajaxSettings={type:"GET",beforeSend:b,success:b,error:b,complete:b,context:null,global:!0,xhr:function(){return new window.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:u,xml:"application/xml, text/xml",html:f,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0},t.ajax=function(e){var a,o=t.extend({},e||{}),s=t.Deferred&&t.Deferred();for(i in t.ajaxSettings)void 0===o[i]&&(o[i]=t.ajaxSettings[i]);d(o),o.crossDomain||(a=n.createElement("a"),a.href=o.url,a.href=a.href,o.crossDomain=l.protocol+"//"+l.host!=a.protocol+"//"+a.host),o.url||(o.url=window.location.toString()),j(o);var u=o.dataType,f=/\?.+=\?/.test(o.url);if(f&&(u="jsonp"),o.cache!==!1&&(e&&e.cache===!0||"script"!=u&&"jsonp"!=u)||(o.url=E(o.url,"_="+Date.now())),"jsonp"==u)return f||(o.url=E(o.url,o.jsonp?o.jsonp+"=?":o.jsonp===!1?"":"callback=?")),t.ajaxJSONP(o,s);var C,h=o.accepts[u],p={},m=function(t,e){p[t.toLowerCase()]=[t,e]},x=/^([\w-]+:)\/\//.test(o.url)?RegExp.$1:window.location.protocol,S=o.xhr(),T=S.setRequestHeader;if(s&&s.promise(S),o.crossDomain||m("X-Requested-With","XMLHttpRequest"),m("Accept",h||"*/*"),(h=o.mimeType||h)&&(h.indexOf(",")>-1&&(h=h.split(",",2)[0]),S.overrideMimeType&&S.overrideMimeType(h)),(o.contentType||o.contentType!==!1&&o.data&&"GET"!=o.type.toUpperCase())&&m("Content-Type",o.contentType||"application/x-www-form-urlencoded"),o.headers)for(r in o.headers)m(r,o.headers[r]);if(S.setRequestHeader=m,S.onreadystatechange=function(){if(4==S.readyState){S.onreadystatechange=b,clearTimeout(C);var e,n=!1;if(S.status>=200&&S.status<300||304==S.status||0==S.status&&"file:"==x){u=u||w(o.mimeType||S.getResponseHeader("content-type")),e=S.responseText;try{"script"==u?(1,eval)(e):"xml"==u?e=S.responseXML:"json"==u&&(e=c.test(e)?null:t.parseJSON(e))}catch(i){n=i}n?y(n,"parsererror",S,o,s):v(e,S,o,s)}else y(S.statusText||null,S.status?"error":"abort",S,o,s)}},g(S,o)===!1)return S.abort(),y(null,"abort",S,o,s),S;if(o.xhrFields)for(r in o.xhrFields)S[r]=o.xhrFields[r];var N="async"in o?o.async:!0;S.open(o.type,o.url,N,o.username,o.password);for(r in p)T.apply(S,p[r]);return o.timeout>0&&(C=setTimeout(function(){S.onreadystatechange=b,S.abort(),y(null,"timeout",S,o,s)},o.timeout)),S.send(o.data?o.data:null),S},t.get=function(){return t.ajax(S.apply(null,arguments))},t.post=function(){var e=S.apply(null,arguments);return e.type="POST",t.ajax(e)},t.getJSON=function(){var e=S.apply(null,arguments);return e.dataType="json",t.ajax(e)},t.fn.load=function(e,n,i){if(!this.length)return this;var a,r=this,s=e.split(/\s/),u=S(e,n,i),f=u.success;return s.length>1&&(u.url=s[0],a=s[1]),u.success=function(e){r.html(a?t("<div>").html(e.replace(o,"")).find(a):e),f&&f.apply(r,arguments)},t.ajax(u),this};var T=encodeURIComponent;t.param=function(e,n){var i=[];return i.add=function(e,n){t.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(T(e)+"="+T(n))},C(i,e,n),i.join("&").replace(/%20/g,"+")}}(Zepto),function(t){t.fn.serializeArray=function(){var e,n,i=[],r=function(t){return t.forEach?t.forEach(r):void i.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(i,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&r(t(o).val())}),i},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(Zepto),function(t){"__proto__"in{}||t.extend(t.zepto,{Z:function(e,n){return e=e||[],t.extend(e,t.fn),e.selector=n||"",e.__Z=!0,e},isZ:function(e){return"array"===t.type(e)&&"__Z"in e}});try{getComputedStyle(void 0)}catch(e){var n=getComputedStyle;window.getComputedStyle=function(t){try{return n(t)}catch(e){return null}}}}(Zepto);
    140139
    141 window.$ = Zepto;
     140var $ = window.$ = Zepto;
    142141
    143142/******************************************************************************
    … …  
    170169  // =========================
    171170
    172   var backdrop = '.dropdown-backdrop'
    173   var toggle   = '[data-toggle="dropdown"]'
     171  var backdrop = '.clarinservices-dropdown-backdrop'
     172  var toggle   = '[data-toggle="clarinservices-dropdown"]'
    174173  var Dropdown = function (element) {
    175     $(element).on('click.bs.dropdown', this.toggle)
     174    $(element).on('click.bs.clarinservices-dropdown', this.toggle)
    176175  }
    177176
    … …  
    184183
    185184    var $parent  = getParent($this)
    186     var isActive = $parent.hasClass('open')
     185    var isActive = $parent.hasClass('clarinservices-open')
    187186
    188187    clearMenus()
    … …  
    191190      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
    192191        // if mobile we use a backdrop because click events don't delegate
    193         $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
     192        $('<div class="clarinservices-dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
    194193      }
    195194
    196195      var relatedTarget = { relatedTarget: this }
    197       $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
     196      $parent.trigger(e = $.Event('show.bs.clarinservices-dropdown', relatedTarget))
    198197
    199198      if (e.isDefaultPrevented()) return
    … …  
    204203
    205204      $parent
    206         .toggleClass('open')
    207         .trigger('shown.bs.dropdown', relatedTarget)
     205        .toggleClass('clarinservices-open')
     206        .trigger('shown.bs.clarinservices-dropdown', relatedTarget)
    208207    }
    209208
    … …  
    222221
    223222    var $parent  = getParent($this)
    224     var isActive = $parent.hasClass('open')
     223    var isActive = $parent.hasClass('clarinservices-open')
    225224
    226225    if ((!isActive && e.which != 27) || (isActive && e.which == 27)) {
    … …  
    245244  function clearMenus(e) {
    246245    if (e && e.which === 3) return
     246    if (e && e.target){
     247        var t = $(e.target);
     248        for (var i = 0; i < 3; i ++) {
     249                if (t.hasClass('clarinservices-dropdown-toggle'))return;
     250                t = t.parent();
     251            }
     252    }
    247253    $(backdrop).remove()
    248254    $(toggle).each(function () {
    … …  
    251257      var relatedTarget = { relatedTarget: this }
    252258
    253       if (!$parent.hasClass('open')) return
    254 
    255       $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
     259      if (!$parent.hasClass('clarinservices-open')) return
     260
     261      $parent.trigger(e = $.Event('hide.bs.clarinservices-dropdown', relatedTarget))
    256262
    257263      if (e.isDefaultPrevented()) return
    258264
    259265      $this.attr('aria-expanded', 'false')
    260       $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
     266      $parent.removeClass('clarinservices-open').trigger('hidden.bs.clarinservices-dropdown', relatedTarget)
    261267    })
    262268  }
    … …  
    279285
    280286  $(document)
    281     .on('click.bs.dropdown.data-api', clearMenus)
    282     .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
    283     .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
    284     .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
    285     .on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
    286     .on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)
     287    .on('click.bs.clarinservices-dropdown.data-api', clearMenus)
     288    .on('click.bs.clarinservices-dropdown.data-api', '.clarinservices-dropdown form', function (e) { e.stopPropagation() })
     289    .on('click.bs.clarinservices-dropdown.data-api', toggle, Dropdown.prototype.toggle)
     290    .on('keydown.bs.clarinservices-dropdown.data-api', toggle, Dropdown.prototype.keydown)
     291    .on('keydown.bs.clarinservices-dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
     292    .on('keydown.bs.clarinservices-dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)
    287293
    288294/******************************************************************************
    … …  
    297303        delete window.$
    298304} else {
    299         $ = old$;
     305        window.$ = old$;
    300306}
    301307

  • SRUAggregator/trunk/src/main/resources/assets/js/main.js

    r6183 r6196  
    33"use strict";
    44
    5 var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-47";
     5var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-48";
    66
    77var URLROOT = window.MyAggregator.URLROOT =
    … …  
    461461
    462462                                                React.createElement("div", {className: "col-md-6"},
     463                                                React.createElement("h3", null, "People"),
     464
     465                                                React.createElement("ul", null,
     466                                                        React.createElement("li", null, "Emanuel Dima"),
     467                                                        React.createElement("li", null, "Yana Panchenko"),
     468                                                        React.createElement("li", null, "Oliver Schonefeld"),
     469                                                        React.createElement("li", null, "Dieter Van Uytvanck")
     470                                                ),
     471
     472                                                React.createElement("h3", null, "Statistics"),
     473                                                React.createElement("button", {type: "button", className: "btn btn-default btn-lg", onClick: function() {main.toStatistics(true);}},
     474                                                        React.createElement("span", {className: "glyphicon glyphicon-cog", 'aria-hidden': "true"}, " "),
     475                                                        "View server log"
     476                                                )
     477                                                ),
     478
     479                                                React.createElement("div", {className: "col-md-6"},
    463480                                                React.createElement("h3", null, "Technology"),
    464481
    … …  
    522539                                                        React.createElement("a", {href: "http://creativecommons.org/licenses/by/3.0/", title: "Creative Commons BY 3.0"}, " CC BY 3.0 ")
    523540                                                )
    524                                                 ),
    525 
    526                                                 React.createElement("div", {className: "col-md-6"},
    527                                                 React.createElement("h3", null, "Statistics"),
    528                                                 React.createElement("button", {type: "button", className: "btn btn-default btn-lg", onClick: function() {main.toStatistics(true);}},
    529                                                         React.createElement("span", {className: "glyphicon glyphicon-cog", 'aria-hidden': "true"}, " "),
    530                                                         "View server log"
    531                                                 )
    532                                                 )
     541                                                )
     542
    533543                                        )
    534544                                );

  • SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

    r6182 r6196  
    33"use strict";
    44
    5 var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-47";
     5var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-48";
    66
    77var URLROOT = window.MyAggregator.URLROOT =
    … …  
    461461
    462462                                                <div className="col-md-6">
     463                                                <h3>People</h3>
     464
     465                                                <ul>
     466                                                        <li>Emanuel Dima</li>
     467                                                        <li>Yana Panchenko</li>
     468                                                        <li>Oliver Schonefeld</li>
     469                                                        <li>Dieter Van Uytvanck</li>
     470                                                </ul>
     471
     472                                                <h3>Statistics</h3>
     473                                                <button type="button" className="btn btn-default btn-lg" onClick={function() {main.toStatistics(true);}} >
     474                                                        <span className="glyphicon glyphicon-cog" aria-hidden="true"> </span>
     475                                                        View server log
     476                                                </button>
     477                                                </div>
     478
     479                                                <div className="col-md-6">
    463480                                                <h3>Technology</h3>
    464481
    … …  
    524541                                                </div>
    525542
    526                                                 <div className="col-md-6">
    527                                                 <h3>Statistics</h3>
    528                                                 <button type="button" className="btn btn-default btn-lg" onClick={function() {main.toStatistics(true);}} >
    529                                                         <span className="glyphicon glyphicon-cog" aria-hidden="true"> </span>
    530                                                         View server log
    531                                                 </button>
    532                                                 </div>
    533543                                        </div>
    534544                                </div>;
Note: See TracChangeset for help on using the changeset viewer.