Changeset 6306
- Timestamp:
- 06/17/15 12:06:41 (9 years ago)
- Location:
- SRUAggregator/trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
SRUAggregator/trunk/pom.xml
r6254 r6306 8 8 <groupId>eu.clarin.sru.fcs</groupId> 9 9 <artifactId>aggregator</artifactId> 10 <version>2.0.0-beta-5 0</version>10 <version>2.0.0-beta-51</version> 11 11 <name>FCS Aggregator</name> 12 12 -
SRUAggregator/trunk/src/main/resources/assets/base.css
r6178 r6306 1 .navbar-header a img{ 1 @media (max-width:360px){.hidden-xxs{display:none!important}} 2 3 body.embedded #footer { 4 background-color: #f5f5f5; 5 } 6 7 .navbar-header a img, #footer.embedded a img { 2 8 float:left; 3 9 margin: -3px 5px 0 2px; -
SRUAggregator/trunk/src/main/resources/assets/js/main.js
r6254 r6306 3 3 "use strict"; 4 4 5 var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-5 0";5 var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-51"; 6 6 7 7 var URLROOT = window.MyAggregator.URLROOT = … … 570 570 React.createElement("div", {className: "rightist", style: {position:'absolute', right:'0'}}, 571 571 React.createElement("a", {title: "contact", href: "mailto:fcs@clarin.eu"}, "Contact") 572 ) 573 ) 574 ) 575 ) 576 ); 577 } 578 }); 579 580 var EmbeddedFooter = React.createClass({displayName: 'EmbeddedFooter', 581 render: function() { 582 return ( 583 React.createElement("div", {className: "container", style: {textAlign:'center'}}, 584 React.createElement("div", {className: "row"}, 585 React.createElement("div", {style: {position:'relative', float:'right'}}, 586 React.createElement("div", {className: "rightist", style: {position:'absolute', right:0, width:150}}, 587 React.createElement("a", {href: URLROOT, target: "_blank", tabIndex: "-1"}, 588 React.createElement("img", {width: "28px", height: "28px", src: "img/magglass1.png"}), 589 React.createElement("header", {className: "inline float-left"}, " Content Search ") 590 ) 572 591 ) 573 592 ) … … 612 631 if (!isEmbeddedView()) { 613 632 React.render(React.createElement(Footer, null), document.getElementById('footer') ); 614 } else if (jQuery) { 615 jQuery("#footer").remove(); 633 } else { 634 React.render(React.createElement(EmbeddedFooter, null), document.getElementById('footer') ); 635 if (jQuery) { jQuery('body, #footer').addClass('embedded'); } 616 636 } 617 637 -
SRUAggregator/trunk/src/main/resources/assets/js/main.jsx
r6254 r6306 3 3 "use strict"; 4 4 5 var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-5 0";5 var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-51"; 6 6 7 7 var URLROOT = window.MyAggregator.URLROOT = … … 570 570 <div className="rightist" style={{position:'absolute', right:'0'}}> 571 571 <a title="contact" href="mailto:fcs@clarin.eu">Contact</a> 572 </div> 573 </div> 574 </div> 575 </div> 576 ); 577 } 578 }); 579 580 var EmbeddedFooter = React.createClass({ 581 render: function() { 582 return ( 583 <div className="container" style={{textAlign:'center'}}> 584 <div className="row"> 585 <div style={{position:'relative', float:'right'}}> 586 <div className="rightist" style={{position:'absolute', right:0, width:150}}> 587 <a href={URLROOT} target="_blank" tabIndex="-1"> 588 <img width="28px" height="28px" src="img/magglass1.png"/> 589 <header className="inline float-left"> Content Search </header> 590 </a> 572 591 </div> 573 592 </div> … … 612 631 if (!isEmbeddedView()) { 613 632 React.render(<Footer />, document.getElementById('footer') ); 614 } else if (jQuery) { 615 jQuery("#footer").remove(); 633 } else { 634 React.render(<EmbeddedFooter />, document.getElementById('footer') ); 635 if (jQuery) { jQuery('body, #footer').addClass('embedded'); } 616 636 } 617 637 -
SRUAggregator/trunk/src/main/resources/assets/js/search.js
r6154 r6306 502 502 (window.MyAggregator.URLROOT + "?" + encodeQueryData({query:query, mode:'search'})); 503 503 return ( 504 React.createElement("a", {className: "btn btn-default input-lg", type: "button", target: "_blank", href: newurl}, 504 React.createElement("a", {className: "btn btn-default input-lg", style: {paddingTop:13}, 505 type: "button", target: "_blank", href: newurl}, 505 506 React.createElement("i", {className: "glyphicon glyphicon-search"}) 506 507 ) … … 551 552 ), 552 553 553 React.createElement("div", {className: "input-group-btn "},554 React.createElement("div", {className: "input-group-btn hidden-xxs"}, 554 555 React.createElement("ul", {ref: "layerDropdownMenu", className: "dropdown-menu"}, 555 556 layers.map(function(l) { … … 569 570 ), 570 571 571 this.props.embedded ? false : 572 React.createElement("div", {className: "input-group"}, 572 React.createElement("div", {className: "input-group hidden-xs"}, 573 573 React.createElement("span", {className: "input-group-addon nobkg"}, "in"), 574 574 React.createElement("button", {type: "button", className: "btn btn-default", onClick: this.toggleCorpusSelection}, … … 577 577 ), 578 578 579 this.props.embedded ? false : 580 React.createElement("div", {className: "input-group"}, 579 React.createElement("div", {className: "input-group hidden-xs hidden-sm"}, 581 580 React.createElement("span", {className: "input-group-addon nobkg"}, "and show up to"), 582 581 React.createElement("div", {className: "input-group-btn"}, -
SRUAggregator/trunk/src/main/resources/assets/js/search.jsx
r6154 r6306 502 502 (window.MyAggregator.URLROOT + "?" + encodeQueryData({query:query, mode:'search'})); 503 503 return ( 504 <a className="btn btn-default input-lg" type="button" target="_blank" href={newurl}> 504 <a className="btn btn-default input-lg" style={{paddingTop:13}} 505 type="button" target="_blank" href={newurl}> 505 506 <i className="glyphicon glyphicon-search"></i> 506 507 </a> … … 551 552 </div> 552 553 553 <div className="input-group-btn ">554 <div className="input-group-btn hidden-xxs"> 554 555 <ul ref="layerDropdownMenu" className="dropdown-menu"> 555 556 { layers.map(function(l) { … … 569 570 </div> 570 571 571 { this.props.embedded ? false : 572 <div className="input-group"> 572 <div className="input-group hidden-xs"> 573 573 <span className="input-group-addon nobkg">in</span> 574 574 <button type="button" className="btn btn-default" onClick={this.toggleCorpusSelection}> 575 575 {this.state.corpora.getSelectedMessage()} <span className="caret"/> 576 576 </button> 577 </div> } 578 579 { this.props.embedded ? false : 580 <div className="input-group"> 577 </div> 578 579 <div className="input-group hidden-xs hidden-sm"> 581 580 <span className="input-group-addon nobkg">and show up to</span> 582 581 <div className="input-group-btn"> … … 587 586 </div> 588 587 <span className="input-group-addon nobkg">hits</span> 589 </div> }588 </div> 590 589 </form> 591 590 </div>
Note: See TracChangeset
for help on using the changeset viewer.