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

Commit

Permalink
Change how layout is built in Orbit theme.
Browse files Browse the repository at this point in the history
Basic "group by" implementation for FilesList, applied to the notification/alert list
Reload a FetchedResultPane in a discrete mode.
Fix ajxpTabsCount value in AjxpTabulator
Send IM to trigger user feed reloading. TODO: Still to disable the polling, not clear why it's still running.
  • Loading branch information
cdujeu committed Jul 5, 2014
1 parent 0c25d7c commit e0312d5
Show file tree
Hide file tree
Showing 32 changed files with 222 additions and 165 deletions.
9 changes: 2 additions & 7 deletions core/src/plugins/access.ajxp_conf/manifest.xml
Expand Up @@ -35,7 +35,7 @@
}
</style>
]]></template_part>
<template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}'><![CDATA[
<template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}' theme="vision"><![CDATA[
<style>
#workspace_toolbar{display:none;}
#global_toolbar{background-color: #30383A;}
Expand Down Expand Up @@ -83,7 +83,7 @@
});
</script>
]]></template_part>
<template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOption":"true"}' theme="orbit"><![CDATA[
<template_part ajxpId="orbit_content" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOption":"true"}' theme="orbit"><![CDATA[
<div id="vertical_splitter" class="settings_main_pane" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "invisibleBar":true, "initA": "20%", "minA":28, "maxA":380, "fit":"height","fitParent":"browser", "minSize":0, "foldingButton":"A"}'>
<div ajxpClass="AjxpTabulator" id="leftTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"ajxp_conf.122","iconClass":"icon-cogs","element":"leftPane"},{"id":"flagged","label":"147","iconClass":"icon-bookmark","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
<div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
Expand All @@ -103,11 +103,6 @@
</div>
</div>
</div>
<style>
#get_my_feed_button{
display:none !important;
}
</style>
</div>
<script>
if($("browser")) $("browser").ajxpPaneObject.resize();
Expand Down
113 changes: 49 additions & 64 deletions core/src/plugins/access.ajxp_user/manifest.xml
Expand Up @@ -81,59 +81,6 @@
}
</style>
]]></template_part>
<template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}' theme="orbit"><![CDATA[
<div id="search_container_settings" class="settings_search_container" style="display:none;" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
<style>
#workspace_toolbar{display:none;}
#browser{padding:0}
div.flat_tabulator span.toggleHeader{
background-color: #e35d52;
}
.largeButton, .SF_input.SF_inlineButton{
background-color: #e35d52;
}
.action_bar{
background-color: #ebedf0;
padding: 4px;
border-left:1px solid #5C5C5C;
}
#user_profile_form, div.class-FetchedResultPane{
border-left:1px solid #5C5C5C;
}
#account_pane .action_bar{
text-align: right;
}
.action_bar a{
background-color: #e35d52;
margin-top:3px;
cursor: pointer;
}
div.class-FetchedResultPane{
background-color: #f8f8f8;
}
#buttons_bar{
padding-bottom: 2px;
text-align: right;
}
#buttons_bar a {
padding-bottom: 0;
height: 26px;
}
.action_bar span.actionbar_button_label{
font-size: 11px;
}
.flat_tabulator div.panelHeader.tabulatorContainer{
background-color: #30383A;
padding-top: 10px;
}
.flat_tabulator span.toggleHeader:first-of-type {
background-color: #e35d52 !important;
}
.flat_tabulator span.toggleHeader.toggleInactive {
background-color: rgba(119, 119, 119, 0.35) !important;
}
</style>
]]></template_part>
<template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOptionUser":"true", "messageBoxReference":true}' theme="vision"><![CDATA[
<div id="userdashboard_main_tab" ajxpClass="AjxpTabulator" class="dashboard_main_pane flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "saveState":false,"events":{}, "defaultTabId": "home","tabInfos" : [{"id":"home","label":"Home","iconClass":"icon-home", "element":"home_account_pane"},{"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="home_account_pane" ajxpClass="UserDashboardHome">
Expand Down Expand Up @@ -182,7 +129,55 @@
}, 100);
</script>
]]></template_part>
<template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOptionUser":"true", "messageBoxReference":true}' theme="orbit"><![CDATA[
<template_part ajxpId="orbit_content" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOptionUser":"true", "messageBoxReference":true}' theme="orbit"><![CDATA[
<style>
div.flat_tabulator span.toggleHeader{
background-color: #e35d52;
}
.largeButton, .SF_input.SF_inlineButton{
background-color: #e35d52;
}
.action_bar{
background-color: #ebedf0;
padding: 4px;
border-left:1px solid #5C5C5C;
}
#user_profile_form, div.class-FetchedResultPane{
border-left:1px solid #5C5C5C;
}
#account_pane .action_bar{
text-align: right;
}
.action_bar a{
background-color: #e35d52;
margin-top:3px;
cursor: pointer;
}
div.class-FetchedResultPane{
background-color: #f8f8f8;
}
#buttons_bar{
padding-bottom: 2px;
text-align: right;
}
#buttons_bar a {
padding-bottom: 0;
height: 26px;
}
.action_bar span.actionbar_button_label{
font-size: 11px;
}
.flat_tabulator div.panelHeader.tabulatorContainer{
background-color: #30383A;
padding-top: 10px;
}
.flat_tabulator span.toggleHeader:first-of-type {
background-color: #e35d52 !important;
}
.flat_tabulator span.toggleHeader.toggleInactive {
background-color: rgba(119, 119, 119, 0.35) !important;
}
</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": "home","tabInfos" : [{"id":"home","label":"Home","iconClass":"icon-home", "element":"home_account_pane"},{"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="home_account_pane" ajxpClass="UserDashboardHome">
<div id="welcome"></div>
Expand Down Expand Up @@ -219,16 +214,6 @@
</div>
</div>
</div>
<script>
document.observeOnce("ajaxplorer:context_changed", function(){
try{
$("browser").ajxpPaneObject.resize();
}catch(e){}
});
window.setTimeout(function(){
try{ $("browser").ajxpPaneObject.resize(); }catch(e){}
}, 100);
</script>
]]></template_part>
<component_config className="AjxpTabulator::userdashboard_main_tab">
<additional_tab id="tutorials_pane"
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/access.demo/manifest.xml
Expand Up @@ -20,6 +20,7 @@
<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*" exclude=""/>
<external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/client_configs/*" exclude=""/>
<external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/hooks/*" exclude=""/>
<external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
</registry_contributions>
<dependencies>
<pluginClass pluginName="access.fs"/>
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/access.dropbox/manifest.xml
Expand Up @@ -12,6 +12,7 @@
<class_definition filename="plugins/access.dropbox/class.dropboxAccessDriver.php" classname="dropboxAccessDriver"/>
<registry_contributions>
<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*"/>
<external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*"/>
<external_file filename="plugins/access.fs/manifest.xml" include="client_configs/*"/>
<external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/hooks/*" exclude=""/>
Expand Down
49 changes: 49 additions & 0 deletions core/src/plugins/access.fs/fsTemplatePart.xml
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<registry_contributions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
<client_configs>
<template_part ajxpClass="AjxpPane" ajxpId="orbit_content" ajxpOptions="{}" theme="orbit"><![CDATA[
<div id="workspace_toolbar" ajxpClass="AjxpPane">
<div id="repo_chooser" style="width:15px;" ajxpClass="RepositorySelect" ajxpOptions='{"menuPosition": "bottom middle", "menuOffsetTop":5, "menuOffsetLeft":110, "menuMaxHeight":535, "menuEvent":"over", "simpleLabel":"<span class=\"icon-caret-down\"></span>"}'></div>
<div id="breadcrumb" class="breadcrumbs-arrow" ajxpClass="Breadcrumb" ajxpOptions='{"use_ul":true, "always_show_root":true, "hide_home_icon":true, "flexTo":"workspace_toolbar", "flexToMargin":50, "checkSiblings":true}'></div>
<div style="float:right;width:210px;" 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":"ajxp_desktop", "fitMarginBottom":20}'></div>
<div style="clear:both;" class="skipSibling"></div>
</div>
<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
<div id="vertical_splitter2" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "autoFoldOnEvent":"ajaxplorer:context_changed", "initA":320, "minA":26, "maxA":320, "fit":"height","fitParent":"browser", "minSize":0, "foldingButton":"A", "invisibleBar": true}'>
<div id="topPane" ajxpClass="AjxpTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"130","iconClass":"icon-folder-close","element":"navigation_pane"},{"id":"feed","label":"notification_center.1","iconClass":"icon-rss","element":"feed_pane"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["filter","vertical_splitter2-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
<div id="navigation_pane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","replaceScroller":true}' >
<h3>Bookmarks <small id="bookmarks_toggler" ajxpClass="VisibilityToggler" ajxpOptions='{"widget_id":"flagged_elements"}'>hide</small></h3>
<div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"replaceScroller":false, "fit":"content", "silentLoading":true, "nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_bookmarked"},"reloadOnServerMessage":"tree/reload_bookmarks", "connexion_discrete":true}'></div>
<h3>Folders <small id="folders_pane_toggler" ajxpClass="VisibilityToggler" ajxpOptions='{"widget_id":"folder_pane", "detection_id":"tree_container"}'>hide</small></h3>
<div id="folder_pane" class="show_first_level" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":false,"fit":"content"}' ></div>
<h3>Shared <small id="shared_files_toggler" class="simple-toggler-show" ajxpClass="VisibilityToggler" ajxpOptions='{"widget_id":"shared_files_list"}'>show</small></h3>
<div style="display:none;" id="shared_files_list" ajxpClass="FetchedResultPane" ajxpOptions='{"fit":"content","silentLoading":true, "nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_shared", "connexion_discrete":true}}'></div>
</div>
<div id="feed_pane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","replaceScroller":true}' >
<div id="notif_pane" ajxpClass="FetchedResultPane" ajxpOptions='{"columnsDef":[{"attributeName":"ajxp_label", "messageId":1, "sortType":"String"},{"attributeName":"event_time", "messageString":"Time", "sortType":"MyDate"},{"attributeName":"event_type", "messageString":"Type", "sortType":"String"}], "reloadOnServerMessage":"tree/reload_user_feed", "silentLoading":true, "groupByData":"event_type", "fixedSortColumn":"event_time", "fixedSortDirection":"desc","nodeProviderProperties":{"get_action":"get_my_feed", "connexion_discrete":true, "format":"xml", "current_repository":"true", "merge_description":"true"}}'></div>
</div>
</div>
<div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
<div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"browser","registerAsEditorOpener":true, "saveState":true,"events":{"ajaxplorer:context_changed":"this.switchTabulator(this.tabulatorData.first().id);"}, "defaultTabId": "files","tabInfos" : [{"id":"files","label":"","iconClass":"icon-folder-open", "element":"files_list_pane"}]}'>
<div id="files_list_pane" ajxpClass="AjxpPane">
<div id="files_list_header" ajxpClass="AjxpPane">
<div id="display_toolbar" class="text_only" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["default"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
<div style="float:left;" ajxpClass="AjxpPane" id="buttons_bar_cont">
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation","get"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
</div>
</div>
<div id="vertical_splitter" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "initA":"70%", "minB":260,"fit":"height","fitParent":"browser", "minSize":0, "foldingButton":"B", "invisibleBar": true}'>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail","replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"files_lit_pane", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}' style="border-left: 1px solid #bbb;"></div>
<div id="info_panel" ajxpClass="InfoPanel" style="top:0;" ajxpOptions='{"replaceScroller":"true", "skipActions":true,"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["filter","vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'></div>
</div>
</div>
</div>
</div>
</div>
</div>
]]></template_part>
</client_configs>
</registry_contributions>
1 change: 1 addition & 0 deletions core/src/plugins/access.fs/manifest.xml
Expand Up @@ -22,6 +22,7 @@
<class_definition filename="plugins/access.fs/class.fsAccessDriver.php" classname="fsAccessDriver"/>
<registry_contributions>
<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
<external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
<client_configs>
<component_config className="FilesList">
<columns switchGridMode="filelist">
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/access.ftp/manifest.xml
Expand Up @@ -36,6 +36,7 @@
<property name="display" value="d"/>
</component_config>
</client_configs>
<external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*"/>
<external_file filename="plugins/access.remote_fs/additionalActions.xml" include="actions/*"/>
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/access.hpcloud/manifest.xml
Expand Up @@ -15,6 +15,7 @@
<param name="CONTAINER" type="string" label="CONF_MESSAGE[Container]" description="CONF_MESSAGE[Base Container]" mandatory="true"/>
</server_settings>
<registry_contributions>
<external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
<external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/client_configs/*" exclude=""/>
<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*" exclude=""/>
Expand Down

0 comments on commit e0312d5

Please sign in to comment.