Fix #357 The return of the bookmarks in Settings!

pydio · Dec 18, 2013 · 06e9110 · 06e9110
1 parent d60bd04
commit 06e9110
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 9 deletions.
diff --git a/core/src/plugins/access.ajxp_conf/ajxp_conf.css b/core/src/plugins/access.ajxp_conf/ajxp_conf.css
@@ -83,8 +83,8 @@
 .settings_search_container{
     display: block;
     padding: 0;
-    height: 34px;
-    background-color: rgba(92, 92, 92, 0.61);
+    height: 35px;
+    background-color: rgba(138, 149, 160, 0.28);
     margin-right: 0;
     padding-top: 4px;
     border-bottom: 1px Solid #5C5C5C;
@@ -133,4 +133,28 @@
 
 .flat_tree_pane > #tree_container{
     background-color: #f8f8f8;
+}
+
+#leftTabulator div.tabulatorContainer {
+    border-bottom: 1px solid #5c5c5c;
+    height: 38px;
+}
+
+#leftTabulator span.toggleHeader {
+    border-right: 1px solid #5c5c5c;
+    padding: 11px 20px;
+    font-size: 13px;
+}
+
+div.class-FetchedResultPane {
+    background-color: #f8f8f8;
+    border-left: 1px solid rgb(187,187,187);
+}
+
+#leftTabulator span.toggleHeader.toggleInactive {
+    background-color: rgb(138, 149, 160);
+}
+
+#leftTabulator div.panelHeader{
+    background-color: rgba(138, 149, 160, 0.79);
 }
diff --git a/core/src/plugins/access.ajxp_conf/i18n/de.php b/core/src/plugins/access.ajxp_conf/i18n/de.php
@@ -144,4 +144,5 @@
 "119" => "Set user group",
 "120" => "Go Pro",
 "121" => "Get professional support for your install",
+"122" => "All Settings",
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/en.php b/core/src/plugins/access.ajxp_conf/i18n/en.php
@@ -142,4 +142,5 @@
 "119" => "Set user group",
 "120" => "Go Pro",
 "121" => "Get professional support for your install",
+"122" => "All Settings",
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/es.php b/core/src/plugins/access.ajxp_conf/i18n/es.php
@@ -142,4 +142,5 @@
 "119" => "Fijar grupo de usuario",
     "120" => "Go Pro",
     "121" => "Get professional support for your install",
+    "122" => "All Settings",
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/fi.php b/core/src/plugins/access.ajxp_conf/i18n/fi.php
@@ -145,5 +145,6 @@
 "119" => "Set user group",
     "120" => "Go Pro",
     "121" => "Get professional support for your install",
+    "122" => "All Settings",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/fr.php b/core/src/plugins/access.ajxp_conf/i18n/fr.php
@@ -140,7 +140,8 @@
 "118" => "Nouveau Groupe",
 "group_access" => "G",
 "119" => "Set user group",
-    "120" => "Go Pro",
-    "121" => "Get professional support for your install",
+"120" => "Go Pro",
+"121" => "Get professional support for your install",
+"122" => "Paramètres",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/hu.php b/core/src/plugins/access.ajxp_conf/i18n/hu.php
@@ -144,5 +144,6 @@
 "119" => "Set user group",
     "120" => "Go Pro",
     "121" => "Get professional support for your install",
+    "122" => "All Settings",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/pt.php b/core/src/plugins/access.ajxp_conf/i18n/pt.php
@@ -142,4 +142,5 @@
 "119" => "Definir grupo do utilizador",
     "120" => "Go Pro",
     "121" => "Get professional support for your install",
+    "122" => "All Settings",
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/si.php b/core/src/plugins/access.ajxp_conf/i18n/si.php
@@ -143,4 +143,5 @@
 "119" => "Set user group",
     "120" => "Go Pro",
     "121" => "Get professional support for your install",
+    "122" => "All Settings",
 );
diff --git a/core/src/plugins/access.ajxp_conf/manifest.xml b/core/src/plugins/access.ajxp_conf/manifest.xml
@@ -43,15 +43,18 @@
             ]]></template_part>
             <template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOption":"true"}' theme="vision"><![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 id="leftPane"  style="background-color:#ebedf0;" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                        <div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10}'></div>
-                        <div id="settings_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
-                        <div id="buttons_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+                    <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":["filter"],"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>
+                        <div id="leftPane"  style="background-color:#ebedf0;" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
+                            <div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10}'></div>
+                            <div id="settings_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
+                            <div id="buttons_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+                        </div>
                     </div>
                     <div id="rightPane"  style="background-color:#fffff; border-left: 1px solid #5C5C5C;" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "messageBoxReference":true}'>
                         <div id="editor_tabs" ajxpClass="AjxpTabulator" class="flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":true, "saveState":false,"events":{"ajaxplorer:context_changed":"this.switchTabulator(this.tabulatorData.first().id);"}, "defaultTabId": "info","tabInfos" : [{"id":"info","label":"","iconClass":"icon-list-alt", "element":"files_list_pane"}]}'>
                             <div id="files_list_pane" ajxpClass="AjxpPane">
-                                <div id="breadcrumb_container"><div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions=''></div></div>
+                                <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>