Fix minisite:

> Display workspace description > Do not display label/description if no user logged.
pydio · Nov 16, 2013 · fcf1a80 · fcf1a80
1 parent 756067f
commit fcf1a80
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 13 deletions.
diff --git a/core/src/plugins/action.share/res/minisite.php b/core/src/plugins/action.share/res/minisite.php
@@ -9,14 +9,24 @@
         <link rel="stylesheet" href="AJXP_PATH_TO_ROOT/plugins/gui.ajax/res/themes/vision/css/font-awesome.css"/>
         <link rel="stylesheet" href="AJXP_PATH_TO_ROOT/plugins/gui.ajax/res/themes/vision/css/media.css"/>
         <style type="text/css">
-            .widget_title{
+            #widget_title{
                 font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
                 font-size: 30px;
                 font-weight: normal;
                 padding: 10px 0 0 5px;
-                color: rgb(111,123,136);
                 margin-right: 5px;
+                color: rgb(111,123,136);
+                line-height: 25px;
+            }
+
+            #widget_title div.repository_title{
+                font-size: 30px;
+            }
+
+            #widget_title div.repository_description{
+                font-size: 12px;
             }
+
             .widget_logo {
                 background-image: url('AJXP_PATH_TO_ROOT/plugins/gui.ajax/PydioLogo250.png');
                 background-repeat: no-repeat;
@@ -138,8 +148,6 @@
     </head>
 
     <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" class="AJXP_PRELOGED_USER">
-        <div class="widget_logo"></div>
-        <div class="widget_title">AJXP_REPOSITORY_LABEL</div>
         <div id="ajxp_shared_folder" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "fitParent":"window"}'></div>
     </body>
 </html>
diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml
@@ -184,6 +184,8 @@
 			]]></template>
             <template name="minisite_vision" element="ajxp_shared_folder" position="top" theme="vision"><![CDATA[
 				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_shared_folder"}'>
+                    <div class="widget_logo"></div>
+                    <div id="widget_title" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
       			    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["minisite", "inline"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
                     <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
                         <div id="cpane_header" class="panelHeader">

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.RepositorySimpleLabel.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.RepositorySimpleLabel.js
@@ -29,10 +29,19 @@ Class.create("RepositorySimpleLabel", AjxpPane, {
 
     initialize : function($super, oElement, options){
 
+        options = Object.extend({
+            displayLabelLegend: true,
+            displayWorkspaceDescription: false
+        }, options);
+
         $super(oElement, options);
 
-        this.htmlElement.update('<div class="repository_legend">Workspace</div>');
+        if(this.options.displayLabelLegend) this.htmlElement.update('<div class="repository_legend">Workspace</div>');
         this.htmlElement.insert('<div class="repository_title"></div>');
+        if(this.options.displayWorkspaceDescription){
+            this.htmlElement.insert('<div class="repository_description"></div>');
+        }
+
         if(options.link){
             var linkTitle;
             if(options.linkTitle){
@@ -52,12 +61,18 @@ Class.create("RepositorySimpleLabel", AjxpPane, {
         this.observer = function(e){
 
             this.htmlElement.down("div.repository_title").update(this._defaultString);
+            if(this.options.displayWorkspaceDescription){
+                this.htmlElement.down("div.repository_description").update('');
+            }
             var repositoryList = e.memo.list;
             var repositoryId = e.memo.active;
             if(repositoryList && repositoryList.size()){
                 var repoObject = repositoryList.get(repositoryId);
                 if(repoObject){
                     this.htmlElement.down("div.repository_title").update(repoObject.getLabel());
+                    if(this.options.displayWorkspaceDescription){
+                        this.htmlElement.down("div.repository_description").update(repoObject.getDescription());
+                    }
                 }
             }
         }.bind(this);

diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
@@ -1076,28 +1076,36 @@ input.SF_input.SF_number{
     border: 1px solid #ddd;
 }
 
-#login_form{
+#login_form,
+#login_form_dynamic
+{
     margin: 0 53px;
     font-size: 15px;
     padding-top: 20px;
     padding-bottom: 20px;
 }
 
-#login_form div.SF_label{
+#login_form div.SF_label,
+#login_form_dynamic div.SF_label{
     display: none;
 }
 
-#login_form.no_placeholder div.SF_label{
+#login_form.no_placeholder div.SF_label,
+#login_form_dynamic.no_placeholder div.SF_label
+{
     display: block;
     text-align: left;
     padding: 0 4px;
 }
 
-#login_form.no_placeholder div.SF_input{
+#login_form.no_placeholder div.SF_input,
+#login_form_dynamic.no_placeholder div.SF_input
+{
     clear: left;
 }
 
-#login_form div.SF_input > input{
+#login_form div.SF_input > input,
+#login_form_dynamic div.SF_input > input{
     width: 200px !important;
     padding: 4px !important;
     font-size: 17px;
@@ -4266,7 +4274,9 @@ div.dialogBox div.dialogBox.css_boxshadow > div{
     background-color: transparent;
 }
 
-div.dialogBox.form-login_form{
+div.dialogBox.form-login_form,
+div.dialogBox.form-login_form_dynamic
+{
     box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
     -webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
     -moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
@@ -4292,6 +4302,7 @@ div.dialogBox.form-login_form{
 }
 
 div.overlay.form-login_form,
+div.overlay.form-login_form_dynamic,
 div.overlay.form-switch_language_form
 {
     opacity: 1 !important;

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