Merge remote-tracking branch 'upstream/develop' into 2011

core/src/plugins/access.fs/fsTemplatePart.xml

@@ -32,7 +32,7 @@
                     </div>
                 </div>
                 <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser", "flexTo":"browser"}'>
-                    <div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"browser", "refireResize":0.5, "registerAsEditorOpener":false, "saveState":false,"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="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"browser", "refireResize":0.5, "registerAsEditorOpener":true, "saveState":false,"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":["content_pane-actions","vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":5}'></div>

core/src/plugins/boot.conf/htaccess.tpl

@@ -23,3 +23,5 @@ RewriteRule (.*) index.php [L]
 #RewriteCond %{HTTP:Authorization} ^(.*)
 #RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1]
 </IfModule>
+
+AddType application/json .json

core/src/plugins/editor.browser/manifest.xml

@@ -77,8 +77,8 @@
             </action>
     	</actions>
         <extensions>
-            <extension icon="openbrowser_images/earth.png" messageId="openbrowser.7" mime="url"/>
-            <extension icon="openbrowser_images/earth.png" messageId="openbrowser.7" mime="website"/>
+            <extension icon="openbrowser_images/mimes/ICON_SIZE/earth.png" messageId="openbrowser.7" mime="url"/>
+            <extension icon="openbrowser_images/mimes/ICON_SIZE/earth.png" messageId="openbrowser.7" mime="website"/>
         </extensions>
     </registry_contributions>
 </editor>

core/src/plugins/gui.ajax/res/themes/umbra/css/ajaxplorer.css

@@ -2761,6 +2761,225 @@ div.user_entry span.cbContainer
     cursor: pointer;
 }
 
+/***********************/
+/* SHARE DIALOG & BUTTONS
+/***********************/
+#share-folder-minisite-public_button.disabled,
+#share-file-minisite_button.disabled{
+    display: none;
+}
+
+input.share_info_panel_link{
+    width: 98% !important;
+    margin-left: 0;
+    font-size: 16px;
+    height: 16px;
+    padding: 5px 2px;
+}
+
+#ajxp_shared_info_panel > div.infoPanelTable{
+    margin: 3%;
+    width: 94%;
+}
+
+#share_folder_form div.SF_element > div.SF_label {
+    float: none;
+    text-align: left;
+    padding: 0;
+}
+
+#share_folder_form div.dialogContentMainTitle {
+    margin: 20px 0 0;
+}
+
+#share_folder_form div.SF_element > input.SF_input,
+select.minisite_layout_selector
+{
+    width: 96% !important;
+}
+
+div#share-folder-type-chooser {
+    font-size: 13px;
+    margin: 0 6px;
+    line-height: 25px;
+}
+
+.share_leaf div.no_share_leaf,
+.share_leaf span.no_share_leaf,
+div.only_share_leaf,
+span.only_share_leaf
+{
+    display: none !important;
+}
+
+.share_leaf div.only_share_leaf{
+    display: block !important;
+}
+
+.share_leaf span.only_share_leaf{
+    display: inline !important;
+}
+
+input#shared_user{
+    width: 370px !important;
+}
+
+div#target_repository_toggle{
+    display: none !important;
+}
+
+.share_edit div#target_repository_toggle{
+    display: block !important;
+    width: 400px;
+}
+
+.share_edit div#target_repository_toggle span{
+    display: inline;
+}
+
+.share_edit div#target_repository_toggle div.SF_horizontal_actions{
+    text-align: right;
+    margin-top: 5px;
+    margin-bottom: -20px;
+    padding-right: 0;
+}
+
+.share_edit div#target_repository,
+.share_edit div#share-folder-type-chooser,
+.share_edit div#share-folder-type-leaf
+{
+    display: none !important;
+}
+
+.share_edit.edit_parameters div#target_repository,
+.share_edit.type-ws div#target_repository
+{
+    display: block !important;
+}
+
+#target_repository_toggle a {
+    border-bottom: 1px solid #555;
+    cursor: pointer;
+}
+#share_generate{
+    height: 40px;
+}
+
+#share_generate div.largeButton{
+    background-color: #4aCEB0;
+}
+
+#shareDialogButtons{
+    padding-top: 30px;
+    text-align: center;
+}
+
+div#share_update{
+    text-align: center;
+    display: none !important;
+}
+
+div#share_result div.non_macos,
+div#share_result div.macos_only
+{
+    font-size:13px;
+    padding:10px 0 0;
+    text-align:center;
+}
+
+.edit_parameters div#shareDialogButtons,
+.edit_parameters div#share_result
+{
+    display: none;
+}
+
+.edit_parameters div#share_update{
+    display: block !important;
+}
+
+#target_repository_toggle span.params_hide,
+.edit_parameters div#target_repository_toggle span.params_view
+{
+    display: none !important;
+}
+.edit_parameters div#target_repository_toggle span.params_hide{
+    display: inline !important;
+}
+
+.share_edit.type-ws span.params_hide, .share_edit.type-ws span.params_view{
+    display: none !important;
+}
+
+#shareDialogButtons div.largeButton,
+#share_update div.largeButton
+{
+    padding: 5px 15px 7px !important;
+    display: inline-block;
+    float: none;
+}
+
+.share_edit.type-ws div#shareDialogButtons{
+    padding-top: 10px;
+}
+.share_edit.type-ws div#shareDialogButtons div.largeButton,
+.share_edit.type-ws div#share_update div.largeButton
+{
+    display: block;
+    margin: 8px 80px;
+}
+
+#shareDialogButtons div.largeButton.destruct{
+    background-color: #A00;
+}
+
+.share_dialog_toggler{
+    cursor: pointer;
+}
+
+.share_dialog_toggler span.toggler_arrow{
+    float: right;
+    margin-right: 5px;
+    margin-top: 3px;
+    transform:rotate(270deg);
+}
+
+.share_dialog_toggler_closed span.toggler_arrow{
+    transform:rotate(0deg);
+}
+
+.share_dialog_toggled{
+    overflow: hidden;
+    transition: height 0.5s ease;
+}
+
+.share_dialog_toggled_closed{
+    height: 0 !important;
+    overflow: hidden;
+}
+
+#editable_hash_link{
+    margin:4px 10px;
+    font-size:13px;
+}
+
+#description_parameters{
+    margin: 5px 0;
+}
+
+#editable_hash_parameters{
+    margin: 5px;
+}
+
+#ws_shared_users_parameters{
+    margin: 0 5px;
+    position: relative;
+}
+
+#share_folder_form{
+    max-width: 400px;
+}
+
+
 div.user_entry span.cbContainer{
 
 }

core/src/plugins/gui.ajax/res/themes/umbra/css/allz_list.txt

@@ -1,3 +1,4 @@
 themes/umbra/css/xtree.css
 themes/umbra/css/screen.css
-themes/umbra/css/ajaxplorer.css
+themes/umbra/css/ajaxplorer.css
+themes/orbit/css/chosen.css#NO_MINI