Readapt share UIs for orbit theme

pydio · Jul 22, 2014 · 37fc6da · 37fc6da
1 parent bc0b257
commit 37fc6da
Show file tree

Hide file tree

Showing 7 changed files with 175 additions and 32 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -956,6 +956,8 @@ public static function loadMinisite($data, $hash = '')
         $html = str_replace("AJXP_REPOSITORY_LABEL", ConfService::getRepositoryById($repository)->getDisplay(), $html);
         $html = str_replace("AJXP_TEMPLATE_NAME", $templateName, $html);
         $html = str_replace("AJXP_LINK_HASH", $hash, $html);
+        $guiConfigs = AJXP_PluginsService::findPluginById("gui.ajax")->getConfigs();
+        $html = str_replace("AJXP_THEME", $guiConfigs["GUI_THEME"] , $html);
 
         session_name("AjaXplorer_Shared".$hash);
         session_start();

diff --git a/core/src/plugins/action.share/res/minisite.php b/core/src/plugins/action.share/res/minisite.php
@@ -5,11 +5,11 @@
         <base href="AJXP_PATH_TO_ROOT"/>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-        <link rel="icon" type="image/x-png" href="plugins/gui.ajax/res/themes/vision/images/html-folder.png">
-        <link rel="stylesheet" type="text/css" href="plugins/gui.ajax/res/themes/vision/css/allz.css">
-        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/vision/css/font-awesome.css"/>
-        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/vision/css/media.css"/>
-        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/vision/css/animate-custom.css"/>
+        <link rel="icon" type="image/x-png" href="plugins/gui.ajax/res/themes/AJXP_THEME/images/html-folder.png">
+        <link rel="stylesheet" type="text/css" href="plugins/gui.ajax/res/themes/AJXP_THEME/css/allz.css">
+        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/AJXP_THEME/css/font-awesome.css"/>
+        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/AJXP_THEME/css/media.css"/>
+        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/AJXP_THEME/css/animate-custom.css"/>
         <style type="text/css">
             #widget_title{
                 font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
@@ -131,7 +131,7 @@
             };
             document.observe("ajaxplorer:before_gui_load", function(e){
                ajaxplorer.currentThemeUsesIconFonts = true;
-               document.documentElement.className += " ajxp_theme_vision";
+               document.documentElement.className += " ajxp_theme_AJXP_THEME";
            });
             window.ajxpBootstrap = new AjxpBootstrap(startParameters);
             window.ajxpMinisite = true;

diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FilesList.js
@@ -157,6 +157,9 @@ Class.create("FilesList", SelectableElements, {
 
 		this._thumbSize = 64;
 		this._crtImageIndex = 0;
+        if(this.options.fixedThumbSize){
+            this._fixedThumbSize = this.options.fixedThumbSize;
+        }
 
 		this._pendingFile = null;
 		this.allDraggables = new Array();
@@ -1043,7 +1046,7 @@ Class.create("FilesList", SelectableElements, {
             this.htmlElement.down('.table_rows_container').setStyle({width:'100%'});
     	}
         if(this._displayMode == 'thumb'){
-            this.resizeThumbnails();
+            this.resizeThumbnails(null, true);
         }
 		this.notify("resize");
         document.fire("ajaxplorer:resize-FilesList-" + this.htmlElement.id, this.htmlElement.getDimensions());
@@ -2128,7 +2131,7 @@ Class.create("FilesList", SelectableElements, {
 	 * Resize the thumbnails
 	 * @param one_element HTMLElement Optionnal, if empty all thumbnails are resized.
 	 */
-	resizeThumbnails: function(one_element){
+	resizeThumbnails: function(one_element, skipResize){
 
 		var elList;
 		if(one_element) elList = [one_element]; 
@@ -2185,15 +2188,15 @@ Class.create("FilesList", SelectableElements, {
             var scrollElement = this.htmlElement.down(".selectable_div");
             scrollElement.setStyle({width:(elList.length * (this._thumbSize + 46)) + 'px'});
         }
-        if(this.options.fit && this.options.fit == 'content'){
+        if(this.options.fit && this.options.fit == 'content' && !skipResize){
             this.resize();
         }
         return tSize;
     },
 
     getAdjustedThumbSize:function(referenceElement){
         var tSize = (this._displayMode=='detail'? this._detailThumbSize:this._thumbSize);
-        if(this._displayMode == 'thumb'){
+        if(this._displayMode == 'thumb' && !this._fixedThumbSize){
             // Readjust tSize
             var w = this._htmlElement.getWidth();
             var margin = parseInt(referenceElement.getStyle('marginLeft')) + parseInt(referenceElement.getStyle('marginRight'));

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
@@ -3947,7 +3947,7 @@ div.selectable_div, .table_rows_container, #tree_container, #bottomSplitPane, .a
     user-select: none;
 }
 
-input, .selectable{
+input, textarea, .selectable{
     -moz-user-select: auto;
     -khtml-user-select: auto;
     -webkit-user-select: auto;

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css