Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Login screen - Advanced search
Browse files Browse the repository at this point in the history
  • Loading branch information
cdujeu committed Jul 17, 2014
1 parent d2e6c19 commit 7fecd59
Show file tree
Hide file tree
Showing 15 changed files with 254 additions and 77 deletions.
6 changes: 6 additions & 0 deletions core/src/plugins/access.ajxp_conf/manifest.xml
Expand Up @@ -116,6 +116,12 @@
if($("browser")) $("browser").ajxpPaneObject.resize();
});
</script>
<style>
#global_toolbar{
background-color: #345E79;
background-image: url("plugins/gui.ajax/res/themes/orbit/images/white_logo.png");
}
</style>
]]></template_part>
</client_configs>
<external_file filename="plugins/access.ajxp_conf/ajxp_confActions.xml" include="actions/*"/>
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/access.ajxp_home/home.css
Expand Up @@ -29,6 +29,7 @@ span.letter_badge {
text-align: center;
padding: 7px 0;
font-size: 0.8em;
font-family: "Open Sans Regular";
}

#home_left_bar{
Expand Down
1 change: 0 additions & 1 deletion core/src/plugins/access.ajxp_home/manifest.xml
Expand Up @@ -83,7 +83,6 @@
<style>
#global_toolbar{
height: 0;
background-image: none;
}
#clickable_home{
display:none;
Expand Down
3 changes: 3 additions & 0 deletions core/src/plugins/access.ajxp_user/manifest.xml
Expand Up @@ -174,6 +174,9 @@
.flat_tabulator span.toggleHeader.toggleInactive {
background-color: rgba(119, 119, 119, 0.35) !important;
}
#global_toolbar{
background-image: url("plugins/gui.ajax/res/themes/orbit/images/white_logo.png");
}
</style>
<div id="userdashboard_main_tab" ajxpClass="AjxpTabulator" class="dashboard_main_pane horizontal_tabulator left_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "saveState":false,"events":{}, "tabsTips":"middle right", "defaultTabId": "parameters","tabInfos" : [{"id":"parameters","label":"user_dash.43", "title":"user_dash.43t","iconClass":"icon-cog", "element":"parameters_pane"},{"id":"info","label":"user_dash.46", "title":"user_dash.47","iconClass":"icon-book", "element":"files_list_pane"}]}'>
<div id="files_list_pane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
Expand Down
6 changes: 5 additions & 1 deletion core/src/plugins/access.fs/fsTemplatePart.xml
Expand Up @@ -8,7 +8,7 @@
<div style="float:right;margin-top:14px;" ajxpClass="AjxpPane" ajxpOptions='{}' id="search_engine_cont">
<div id="buttons_bar_top" style="float:right;" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
</div>
<div id="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "openSearchInput":"true", "toggleResultsFitTo":"files_list_pane", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}'></div>
<div id="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "openSearchInput":"true", "searchChooserAsResultsHeader":true, "toggleResultsFitTo":"cpane_tabs", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}'></div>
<div style="clear:both;" class="skipSibling"></div>
</div>
<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
Expand Down Expand Up @@ -47,6 +47,10 @@
.breadcrumbs-one li:nth-child(1) span:before{
border-left-color: #f5f5f5;
}
#global_toolbar{
background-color: #345E79;
background-image: url("plugins/gui.ajax/res/themes/orbit/images/white_logo.png");
}
</style>
]]></template_part>
</client_configs>
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpPane.js
Expand Up @@ -177,6 +177,15 @@ Class.create("AjxpPane", {
this.htmlElement.setStyle({width:newWidth + 'px'});
}
}

if(this.options.imageBackgroundFromConfigs && this.htmlElement.getHeight()){
var ratio = this.htmlElement.getWidth() / this.htmlElement.getHeight();
if(ratio < 1){
this.htmlElement.addClassName('fit_background_height');
}else{
this.htmlElement.removeClassName('fit_background_height');
}
}
this.childrenPanes.invoke('resize');
},

Expand Down
44 changes: 29 additions & 15 deletions core/src/plugins/gui.ajax/res/js/ajaxplorer/class.SearchEngine.js
Expand Up @@ -138,29 +138,36 @@ Class.create("SearchEngine", AjxpPane, {

initMetadataForm: function(formPanel, metadataColumns){

var searchChooser = new Element('div',{id:"basic_search"}).update('<span class="toggle_button open">'+MessageHash[486]+' <span class="icon-caret-down"></span></span>' +
'<span class="toggle_button close">'+MessageHash[487]+' <span class="icon-caret-up"></span></span> ' +
'<span class="search_label open">'+MessageHash[344]+' : </span><span class="search_label close">'+MessageHash[488]+' <span id="refresh_search_button" class="icon-refresh" title="Apply filter now"></span></span><span id="search_meta_options"></span></div>');

if(this._ajxpOptions.searchChooserAsResultsHeader){
formPanel.insert({after:searchChooser});
}else{
formPanel.insert(searchChooser);
}

formPanel.insert('<div id="basic_search"><span class="toggle_button open">'+MessageHash[486]+' <span class="icon-caret-down"></span></span>' +
'<span class="toggle_button close">'+MessageHash[487]+' <span class="icon-caret-up"></span></span> ' +
'<span class="search_label open">'+MessageHash[344]+' : </span><span class="search_label close">'+MessageHash[488]+' <span id="refresh_search_button" class="icon-refresh" title="Apply filter now"></span></span><span id="search_meta_options"></span></div>' +
'<div>' +
formPanel.insert('<div>' +
'<div class="scroller_track"><div class="scroller_handle"></div></div> ' +
'<div id="search_meta_detailed"><div class="advanced_search_section_title"><span class="icon-circle"></span> '+MessageHash[489]+'</div><div class="advanced_search_section"></div></div>' +
'</div>');
'</div>');

var oThis = this;
formPanel.select('.toggle_button').invoke('observe', 'click', function(){
searchChooser.select('.toggle_button').invoke('observe', 'click', function(){
formPanel.toggleClassName('toggle_open');
searchChooser.toggleClassName('toggle_open');
window.setTimeout(function(){
oThis.resize();
}, 150);
if(formPanel.hasClassName('toggle_open') && !formPanel.down('#basename').getValue() && oThis._inputBox.getValue()){

formPanel.down('#basename').setValue(oThis._inputBox.getValue());
formPanel.down('#basename').up('.advanced_search_section').addClassName('visible');
}
});

var simpleMeta = formPanel.down('#search_meta_options');
var simpleMeta = searchChooser.down('#search_meta_options');
var advancedMeta = formPanel.down('#search_meta_detailed').down('.advanced_search_section');

this.initMetaOption(simpleMeta, advancedMeta, 'filename', MessageHash[1], true);
Expand All @@ -186,6 +193,16 @@ Class.create("SearchEngine", AjxpPane, {
'</div>' +
'';
formPanel.down('#search_meta_detailed').insert({top:docPropertyTemplate});
if(this._ajxpOptions.searchChooserAsResultsHeader){
formPanel.down('#search_meta_detailed').insert({top:searchChooser.down('span.search_label.close')});
formPanel.down('#refresh_search_button').observe('click', function(e){
this.search();
}.bind(this));
}else{
searchChooser.down('#refresh_search_button').observe('click', function(e){
this.search();
}.bind(this));
}

formPanel.select('input').each(function(el){
el.observe('focus', ajaxplorer.disableAllKeyBindings.bind(ajaxplorer));
Expand Down Expand Up @@ -216,9 +233,6 @@ Class.create("SearchEngine", AjxpPane, {
oThis.search();
});

formPanel.down('#refresh_search_button').observe('click', function(e){
this.search();
}.bind(this));

formPanel.select('.advanced_search_section_title').invoke('observe', 'click', function(ev){
Event.findElement(ev, '.advanced_search_section_title').next('.advanced_search_section').toggleClassName('visible');
Expand Down Expand Up @@ -285,9 +299,8 @@ Class.create("SearchEngine", AjxpPane, {
}

this.metaOptions = [];
if(this.htmlElement.down('#search_meta')){
this.htmlElement.down('#search_meta').remove();
}
this.htmlElement.select('#search_meta').invoke('remove');
this.htmlElement.select('.meta_toggle_button').invoke('remove');
if(this._ajxpOptions && this._ajxpOptions.metaColumns){

if(this._ajxpOptions.toggleResultsVisibility && this.htmlElement && this.htmlElement.down("#" + this._ajxpOptions.toggleResultsVisibility)){
Expand All @@ -296,8 +309,9 @@ Class.create("SearchEngine", AjxpPane, {
this.htmlElement.down('#search_form').insert({bottom:'<div id="search_meta"></div>'});
}

if(this.htmlElement.down('#search_meta')){
this.initMetadataForm(this.htmlElement.down('#search_meta'), this._ajxpOptions.metaColumns);
var searchMeta = this.htmlElement.down('#search_meta');
if(searchMeta){
this.initMetadataForm(searchMeta, this._ajxpOptions.metaColumns);
}

}else{
Expand Down

0 comments on commit 7fecd59

Please sign in to comment.