Changeset 6171 for SRUAggregator
- Timestamp:
- 04/28/15 17:04:50 (9 years ago)
- Location:
- SRUAggregator/trunk
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
SRUAggregator/trunk/pom.xml
r6156 r6171 8 8 <groupId>eu.clarin.sru.fcs</groupId> 9 9 <artifactId>aggregator</artifactId> 10 <version>2.0.0-beta-4 2</version>10 <version>2.0.0-beta-43</version> 11 11 <name>FCS Aggregator</name> 12 12 -
SRUAggregator/trunk/src/main/resources/assets/CLARIN.css
r6145 r6171 17 17 18 18 a { 19 color: #806a52; 20 text-decoration: dotted !important; 19 /*color: #806a52;*/ 20 color: #B27000; 21 /*text-decoration: dotted !important;*/ 21 22 } 22 23 a:hover, a:focus { … … 319 320 ul#CLARIN_header_right, div#CLARIN_footer_left, div#CLARIN_footer_right { 320 321 margin: 0px 4px 0 p x 4px; 321 color: # 806a52;322 color: #653D00; 322 323 } 323 324 ul#CLARIN_header_right :not(.glyphicon), div#CLARIN_footer_left :not(.glyphicon), div#CLARIN_footer_right :not(.glyphicon) { 324 325 font-size: 12px; 325 font-variant: small-caps;326 326 } 327 327 ul#CLARIN_header_right a, div#CLARIN_footer_left a, div#CLARIN_footer_right a { 328 color: # 806a52;328 color: #653D00; 329 329 text-decoration: none; 330 330 } -
SRUAggregator/trunk/src/main/resources/assets/base.css
r6092 r6171 2 2 /* clarin gold: rgb(128,107,82) #806A52; */ 3 3 4 .navbar-header a img{ 5 float:left; 6 margin: 12px 10px 0 2px; 7 padding: 3px 3px; 8 border-radius: 50% 50%; 9 border: 1px solid #003f6e; 10 box-shadow: inset 0 0 3px #003f6e; 11 } 12 13 14 #clarinmore{ 15 padding:4px 4px; 16 height:32px; 17 width:32px; 18 } 19 20 #clarinmore div { 21 width:6px; 22 height:6px; 23 float:left; 24 margin: 1px 1px; 25 padding: 1px 1px; 26 background-color: #003f6e; 27 border-radius: 50% 50%; 28 /*border: 1px solid #003f6e;*/ 29 box-shadow: inset 0 0 1px white; 30 } 31 4 32 .aligncenter { 5 33 text-align: center; 6 34 } 7 8 35 9 36 .muted { … … 71 98 } 72 99 73 .errorRow { 100 .errorRow { 74 101 position: absolute; 75 102 width: 100%; … … 82 109 color: #fff; 83 110 border-radius: 4px; 84 background-color: #a20; 111 background-color: #a20; 85 112 text-align: center; 86 113 margin: 0 auto; … … 130 157 131 158 /* large spinner */ 132 input[type=number]::-webkit-inner-spin-button, 133 input[type=number]::-webkit-outer-spin-button { 134 margin-left: 2px; 159 input[type=number]::-webkit-inner-spin-button, 160 input[type=number]::-webkit-outer-spin-button { 161 margin-left: 2px; 135 162 font-size:24px; 136 163 } … … 311 338 color: #222; 312 339 } 313 340 314 341 .panel-body span.keyword { 315 342 font-weight: bold; … … 326 353 /*display: inline;*/ 327 354 } 328 355 329 356 .panel-body td.keyword { 330 357 color: #00406F; … … 332 359 font-weight: bold; 333 360 } 334 361 335 362 .bs-callout { 336 363 padding: 0 20px; … … 352 379 } 353 380 .panel-body { 354 border-top: 1px solid #ddd; 381 border-top: 1px solid #ddd; 355 382 } 356 383 … … 462 489 463 490 .beta-tag { 464 position:absolute; 491 position:absolute; 465 492 /*color:rgba(17, 65, 111, 0.1); */ 466 493 color:rgba(128, 107, 82, 0.2); 467 margin: 64px 0 0 0; 494 margin: 64px 0 0 0; 468 495 font-size:36px; 469 496 font-weight:bold; … … 510 537 .statistics li, .statistics div 511 538 { 512 font-family: Consolas,monaco,courier,monospace; 539 font-family: Consolas,monaco,courier,monospace; 513 540 } 514 541 -
SRUAggregator/trunk/src/main/resources/assets/clarinservices/clarinservices.css
r6156 r6171 1 1 #clarinservices button.dropdown-toggle { 2 2 background-color: transparent; 3 padding: 4px 8px;3 padding: 4px 4px; 4 4 } 5 5 … … 12 12 border-top-right-radius: 0 0; 13 13 padding: 20px; 14 } 15 16 #clarinservices ul .flex { 17 display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ 18 display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ 19 display: -ms-flexbox; /* TWEENER - IE 10 */ 20 display: -webkit-flex; /* NEW - Chrome */ 21 display: flex; 14 22 } 15 23 … … 26 34 background-color: #fff; 27 35 padding: 30px 25px; 28 transition: background-color .2s, border-color.2s;36 transition: all .2s; 29 37 border-radius: 50% 50%; 30 38 border: 2px solid #fff; -
SRUAggregator/trunk/src/main/resources/assets/clarinservices/clarinservices.js
r6156 r6171 101 101 var rows = service_list.map(renderRow).join(''); 102 102 var tablediv = "<div><table><tbody>" + rows + "</tbody></table></div>"; 103 // '<span class="glyphicon glyphicon-th"></span>'+ 104 // '<img src="img/moreapp60.png"></img>'+ 103 105 return '<div class="dropdown">' + 104 106 '<button class="btn dropdown-toggle" type="button"'+ 105 107 ' id="dropdown-clarinservices" data-toggle="dropdown" aria-expanded="true">'+ 106 // '<span class="glyphicon glyphicon-th"></span>'+ 107 '<img src="img/moreapp60.png"></img>'+ 108 '<div id="clarinmore"> '+ 109 '<div></div> <div></div> <div></div> '+ 110 '<div></div> <div></div> <div></div> '+ 111 '<div></div> <div></div> <div></div> '+ 112 '</div>'+ 108 113 '</button>'+ 109 114 '<ul class="dropdown-menu" role="menu" aria-labelledby="dropdown-clarinservices">'+ -
SRUAggregator/trunk/src/main/resources/assets/js/main.js
r6155 r6171 3 3 "use strict"; 4 4 5 var VERSION = window.MyAggregator.VERSION = " VERSION 2.0.0-beta-41";5 var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-43"; 6 6 7 7 var URLROOT = window.MyAggregator.URLROOT = … … 139 139 ) 140 140 ), 141 React.createElement("ul", {className: "nav navbar-nav navbar-right"}, 142 React.createElement("li", null, 143 React.createElement("div", {id: "clarinservices", style: {padding:4}}) 144 ) 145 ), 141 146 React.createElement("ul", {id: "CLARIN_header_right", className: "nav navbar-nav navbar-right"}, 142 React.createElement("li", null,143 React.createElement("div", {id: "clarinservices", style: {padding:5}})144 ),145 147 this.renderLogin() 146 148 ) … … 155 157 return ( 156 158 React.createElement("div", null, 157 React.createElement("div", {className: "container"},158 React.createElement("div", {className: "beta-tag"},159 React.createElement("span", null, "BETA")160 )161 ),162 163 159 React.createElement("div", {className: "navbar navbar-default navbar-static-top", role: "navigation"}, 164 160 React.createElement("div", {className: "container"}, … … 170 166 React.createElement("span", {className: "icon-bar"}) 171 167 ), 172 React.createElement("a", {className: "navbar-brand", href: URLROOT, tabIndex: "-1"}, React.createElement("header", null, "Federated Content Search")) 168 React.createElement("a", {href: URLROOT, tabIndex: "-1"}, 169 React.createElement("img", {src: "img/magglass1.png"}) 170 ), 171 React.createElement("a", {className: "navbar-brand", href: URLROOT, tabIndex: "-1"}, 172 React.createElement("header", {className: "inline"}, " Content Search ") 173 ) 173 174 ), 174 175 this.renderCollapsible() … … 177 178 178 179 React.createElement(ErrorPane, {errorMessages: this.state.errorMessages}) 180 179 181 ) 180 182 ); … … 440 442 return React.createElement("div", null, 441 443 React.createElement("div", {className: "top-gap"}, 442 React.createElement("h1", null, "About"), 444 React.createElement("h1", {style: {padding:15}}, "About"), 445 446 React.createElement("div", {className: "col-md-6"}, 443 447 React.createElement("h3", null, "Technology"), 444 448 … … 495 499 ), 496 500 501 React.createElement("p", null, "The content search icon is made by", 502 React.createElement("a", {href: "http://www.freepik.com", title: "Freepik"}, " Freepik "), 503 "from", 504 React.createElement("a", {href: "http://www.flaticon.com", title: "Flaticon"}, " www.flaticon.com "), 505 "and licensed under", 506 React.createElement("a", {href: "http://creativecommons.org/licenses/by/3.0/", title: "Creative Commons BY 3.0"}, " CC BY 3.0 ") 507 ) 508 ), 509 510 React.createElement("div", {className: "col-md-6"}, 497 511 React.createElement("h3", null, "Statistics"), 498 512 React.createElement("button", {type: "button", className: "btn btn-default btn-lg", onClick: function() {main.toStatistics(true);}}, 499 513 React.createElement("span", {className: "glyphicon glyphicon-cog", 'aria-hidden': "true"}, " "), 500 514 "View server log" 515 ) 501 516 ) 502 517 ) … … 533 548 React.createElement("a", {title: "contact", href: "mailto:fcs@clarin.eu"}, 534 549 React.createElement("span", {className: "glyphicon glyphicon-envelope"}), 535 React.createElement("span", null, " C ONTACT")550 React.createElement("span", null, " Contact") 536 551 ) 537 552 ) -
SRUAggregator/trunk/src/main/resources/assets/js/main.jsx
r6156 r6171 3 3 "use strict"; 4 4 5 var VERSION = window.MyAggregator.VERSION = " VERSION 2.0.0-beta-42";5 var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-43"; 6 6 7 7 var URLROOT = window.MyAggregator.URLROOT = … … 139 139 </li> 140 140 </ul> 141 <ul className="nav navbar-nav navbar-right"> 142 <li> 143 <div id="clarinservices" style={{padding:4}}/> 144 </li> 145 </ul> 141 146 <ul id="CLARIN_header_right" className="nav navbar-nav navbar-right"> 142 <li>143 <div id="clarinservices" style={{padding:5}}/>144 </li>145 147 {this.renderLogin()} 146 148 </ul> … … 155 157 return ( 156 158 <div> 157 <div className="container">158 <div className="beta-tag">159 <span>BETA</span>160 </div>161 </div>162 163 159 <div className="navbar navbar-default navbar-static-top" role="navigation"> 164 160 <div className="container"> … … 170 166 <span className="icon-bar"></span> 171 167 </button> 172 <a className="navbar-brand" href={URLROOT} tabIndex="-1"><header>Federated Content Search</header></a> 168 <a href={URLROOT} tabIndex="-1"> 169 <img src="img/magglass1.png"/> 170 </a> 171 <a className="navbar-brand" href={URLROOT} tabIndex="-1"> 172 <header className="inline"> Content Search </header> 173 </a> 173 174 </div> 174 175 {this.renderCollapsible()} … … 177 178 178 179 <ErrorPane errorMessages={this.state.errorMessages} /> 180 179 181 </div> 180 182 ); … … 440 442 return <div> 441 443 <div className="top-gap"> 442 <h1>About</h1> 444 <h1 style={{padding:15}}>About</h1> 445 446 <div className="col-md-6"> 443 447 <h3>Technology</h3> 444 448 … … 495 499 </ul> 496 500 501 <p>The content search icon is made by 502 <a href="http://www.freepik.com" title="Freepik"> Freepik </a> 503 from 504 <a href="http://www.flaticon.com" title="Flaticon"> www.flaticon.com </a> 505 and licensed under 506 <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0"> CC BY 3.0 </a> 507 </p> 508 </div> 509 510 <div className="col-md-6"> 497 511 <h3>Statistics</h3> 498 512 <button type="button" className="btn btn-default btn-lg" onClick={function() {main.toStatistics(true);}} > … … 500 514 View server log 501 515 </button> 516 </div> 502 517 </div> 503 518 </div>; … … 533 548 <a title="contact" href="mailto:fcs@clarin.eu"> 534 549 <span className="glyphicon glyphicon-envelope"></span> 535 <span> C ONTACT</span>550 <span> Contact</span> 536 551 </a> 537 552 </div>
Note: See TracChangeset
for help on using the changeset viewer.