Permalink
Browse files

Clean images - Simplify ActionToolbars class (remove bubbling and car…

…ousel)
  • Loading branch information...
1 parent 2e3478d commit 067eed39360cd7e6b7ae0836ff1ee114881cc140 @cdujeu cdujeu committed Sep 16, 2016
Showing with 27 additions and 155 deletions.
  1. +2 −2 core/src/plugins/access.ajxp_conf/manifest.xml
  2. +1 −1 core/src/plugins/access.ajxp_user/manifest.xml
  3. +3 −3 core/src/plugins/access.fs/fsTemplatePart.xml
  4. +2 −2 core/src/plugins/action.cart/manifest.xml
  5. +8 −8 core/src/plugins/action.share/manifest.xml
  6. +1 −1 core/src/plugins/conf.sql/manifest.xml
  7. +0 −2 core/src/plugins/editor.ajxp_repository/class.RepositoryEditor.js
  8. +2 −2 core/src/plugins/gui.ajax/manifest.xml
  9. +1 −124 core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActionsToolbar.js
  10. +1 −1 core/src/plugins/gui.ajax/res/js/ui/prototype/class.SearchEngine.js
  11. +2 −4 core/src/plugins/gui.ajax/res/js/vendor/prototype/proto.menu.js
  12. BIN core/src/plugins/gui.ajax/res/themes/orbit/images/2.gif
  13. BIN core/src/plugins/gui.ajax/res/themes/orbit/images/ajxp-connexion-loader.gif
  14. BIN core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_down_margin.png
  15. BIN core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_left.png
  16. BIN core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_right.png
  17. BIN core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_up.png
  18. BIN core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_up_margin.png
  19. BIN core/src/plugins/gui.ajax/res/themes/orbit/images/fakeFlashButtonBg.gif
  20. +1 −1 core/src/plugins/gui.mobile/manifest.xml
  21. +0 −1 core/src/plugins/meta.git/class.HistoryBrowser.js
  22. +3 −3 core/src/plugins/uploader.html/class.MultiUploader.js
  23. BIN core/src/plugins/{gui.ajax/res/themes/orbit/images → uploader.html/img}/greenled.png
  24. BIN core/src/plugins/{gui.ajax/res/themes/orbit/images → uploader.html/img}/redled.png
  25. BIN core/src/plugins/{gui.ajax/res/themes/orbit/images → uploader.html/img}/yellowled.png
@@ -16,7 +16,7 @@
<client_configs>
<template_part ajxpId="orbit_content" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fitMinOffsetTop":"$(\"global_toolbar\").getHeight();", "fakeOption":"true"}' theme="orbit"><![CDATA[
<div id="vertical_splitter" style="opacity:0;" class="settings_main_pane" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "invisibleBar":true, "initA": 280, "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 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"],"submenuOffsetTop":2}}'>
<div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
<div id="leftPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}' class="vertical_layout">
<div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10, "groupByData":false, "leavesOpenOnSelect": true}'></div>
@@ -28,7 +28,7 @@
<div id="files_list_pane" ajxpClass="AjxpPane" style="overflow-x:hidden;">
<div id="breadcrumb_container"><div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions=''></div><div ajxpClass="BookmarksBar" ajxpOptions='{}' id="bm_bar"></div></div>
<div id="actions" class="buttons_bar_container">
- <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get", "remote"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+ <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get", "remote"],"submenuOffsetTop":2}'></div>
</div>
<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail","replaceScroller":true, "fit":"height", "fitParent":"editor_tabs", "fitMarginBottom":0, "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
</div>
@@ -32,7 +32,7 @@
<div id="my-users-pane" ajxpClass="AjxpPane" class="tabbed_editor">
<div class="title-flex">
<h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.46]<div class="legend">AJXP_MESSAGE[user_dash.49]</div></h3>
- <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"address_book","toolbarsList":["change","address_book"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+ <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"address_book","toolbarsList":["change","address_book"],"submenuOffsetTop":2}'></div>
</div>
<div id="address_book" ajxpClass="FetchedResultPane" ajxpOptions='{"updateGlobalContext":false,"nodeProviderProperties":{"get_action":"ls","dir":"users"}, "displayMode":"detail","replaceScroller":true, "fit":"height", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
</div>
@@ -6,7 +6,7 @@
<span id="left_navigator" ajxpClass="AjxpReactComponent" ajxpOptions='{"componentNamespace":"LeftNavigation","componentName":"Panel"}'></span>
<div id="breadcrumb" class="breadcrumbs-one" ajxpClass="Breadcrumb" ajxpOptions='{"use_ul":true, "always_show_root":true, "hide_home_icon":true, "flexTo":"workspace_toolbar", "flexToMargin":80, "checkSiblings":true, "resize_events":["actions_refreshed"]}'></div>
<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 id="buttons_bar_top" style="float:right;" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put"],"submenuOffsetTop":2}'></div>
</div>
<div id="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "openSearchInput":"true", "openSearchStickLeftTo":"topPane", "searchChooserAsResultsHeader":true, "toggleResultsFitTo":"cpane_tabs", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}'></div>
<div style="clear:both;" class="skipSibling"></div>
@@ -29,9 +29,9 @@
<div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"browser", "refireResize":0.5, "registerAsEditorOpener":true, "saveState":false,"events":{"ajaxplorer:context_changed":"this.switchToFirstIfPathDiffers(arguments[0]);"}, "defaultTabId": "files","tabInfos" : [{"id":"files","label":"","iconClass":"icon-folder-open", "element":"files_list_pane"}]}'>
<div id="files_list_pane" ajxpClass="AjxpPane" ajxpOptions='{"classNamesOn":{"infoPanelFolded":{"event":"vertical_splitter-fold-status","memoKey":"folded"}}}'>
<div id="files_list_header" ajxpClass="AjxpPane">
- <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["content_pane-actions","vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":5}'></div>
+ <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["content_pane-actions","vertical_splitter-actions"],"submenuOffsetTop":5}'></div>
<div style="float:left;position:fixed;" ajxpClass="AjxpPane" id="buttons_bar_cont" ajxpOptions='{"flexTo":"files_list_header", "flexToMargin":30, "resize_events":["switchDisplayMode-FilesList-content_pane"]}'>
- <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "info_panel","info_panel_share", "change_main"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+ <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "info_panel","info_panel_share", "change_main"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","submenuOffsetTop":2}'></div>
</div>
</div>
<div id="vertical_splitter" ajxpClass="Splitter" class="forceComputeFit" ajxpOptions='{"direction": "vertical", "initB":250, "minB":250,"fit":"height","fitParent":"browser", "minSize":250, "invisibleBar": true, "foldingButton":"B", "foldingButtonText":341, "foldingMinSize":0}'>
@@ -25,7 +25,7 @@
tabInfo='{"id":"cart-manager","iconClass":"icon-suitcase","element":"ajxp-cart-manager","closeable":false,"label":"action.cart.10","title":"action.cart.15","dontFocus":true}'
paneInfo='{"type":"widget"}'><![CDATA[
<div id="ajxp-cart-manager" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
- <div id="cart-manager-header" class="innerTabulator" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "saveState":true, "fitParent":"browser","defaultTabId": "default-cart","tabInfos": [{"id":"default-cart","label":"action.cart.9","iconClass":"icon-suitcase", "element":"default-cart"}], "headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["ajxp-cart-manager", "ajxp-cart-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
+ <div id="cart-manager-header" class="innerTabulator" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "saveState":true, "fitParent":"browser","defaultTabId": "default-cart","tabInfos": [{"id":"default-cart","label":"action.cart.9","iconClass":"icon-suitcase", "element":"default-cart"}], "headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["ajxp-cart-manager", "ajxp-cart-actions"],"submenuOffsetTop":2}}'>
<div id="default-cart" ajxpClass="CartManager" ajxpOptions='{"nodeProviderProperties":{}}'></div>
</div>
</div>
@@ -35,7 +35,7 @@
<additional_content id="action_cart"><![CDATA[
<div ajxp_position="9" id="action_cart">
<h3 style="color:#E2DECB;" ajxp_message_id="action.cart.10">AJXP_MESSAGE[action.cart.10]</h3>
- <div id="cart-manager-header" class="innerTabulator" style="height: 200px;" ajxpClass="AjxpTabulator" ajxpOptions='{"saveState":true, "defaultTabId": "default-cart","tabInfos": [{"id":"default-cart","label":"action.cart.9","iconClass":"icon-suitcase", "element":"default-cart"}], "headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["ajxp-cart-manager", "ajxp-cart-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
+ <div id="cart-manager-header" class="innerTabulator" style="height: 200px;" ajxpClass="AjxpTabulator" ajxpOptions='{"saveState":true, "defaultTabId": "default-cart","tabInfos": [{"id":"default-cart","label":"action.cart.9","iconClass":"icon-suitcase", "element":"default-cart"}], "headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["ajxp-cart-manager", "ajxp-cart-actions"],"submenuOffsetTop":2}}'>
<div id="default-cart" ajxpClass="CartManager" ajxpOptions='{"fit":"content", "nodeProviderProperties":{}}'></div>
</div>
</div>
Oops, something went wrong.

0 comments on commit 067eed3

Please sign in to comment.