Make sure textareas are readonly

Add PostgreSQL to install choices
pydio · Dec 18, 2013 · 2ac42b1 · 2ac42b1
1 parent 0e00807
commit 2ac42b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.js b/core/src/plugins/action.share/class.ShareCenter.js
@@ -510,7 +510,7 @@ Class.create("ShareCenter", {
                     directLink += '\
                     <tr>\
                         <td class="infoPanelLabel">'+MessageHash['share_center.60']+'</td>\
-                        <td class="infoPanelValue"><textarea style="width:100%;height: 45px;"><a href="'+ jsonData.publiclet_link +'?dl=true">Download '+node.getLabel()+'</a></textarea></td>\
+                        <td class="infoPanelValue"><textarea style="width:100%;height: 45px;" readonly="true"><a href="'+ jsonData.publiclet_link +'?dl=true">Download '+node.getLabel()+'</a></textarea></td>\
                     </tr>\
                     ';
                     var editors = ajaxplorer.findEditorsForMime(node.getAjxpMime(), true);
@@ -527,7 +527,7 @@ Class.create("ShareCenter", {
                         directLink += '\
                             <tr>\
                                 <td class="infoPanelLabel">'+MessageHash[messKey]+'</td>\
-                                <td class="infoPanelValue"><textarea style="width:100%;height: 80px;">'+ tplString + '</textarea></td>\
+                                <td class="infoPanelValue"><textarea style="width:100%;height: 80px;" readonly="true">'+ tplString + '</textarea></td>\
                             </tr>\
                         ';
                     }
@@ -536,7 +536,7 @@ Class.create("ShareCenter", {
                 container.down('#ajxp_shared_info_panel table').update('\
                     <tr>\
                         <td class="infoPanelLabel">'+MessageHash['share_center.59']+'</td>\
-                        <td class="infoPanelValue"><textarea style="width:100%;height: 45px;">'+ jsonData.publiclet_link +'</textarea></td>\
+                        <td class="infoPanelValue"><textarea style="width:100%;height: 45px;" readonly="true">'+ jsonData.publiclet_link +'</textarea></td>\
                     </tr>'+directLink+'\
                     <tr>\
                         <td class="infoPanelLabel">'+MessageHash['share_center.51']+'</td>\
@@ -566,11 +566,11 @@ Class.create("ShareCenter", {
                     linkString = '\
                     <tr>\
                         <td class="infoPanelLabel">'+MessageHash['share_center.62']+'</td>\
-                        <td class="infoPanelValue"><textarea style="width:100%;height: 40px;">'+ jsonData.minisite.public_link +'</textarea></td>\
+                        <td class="infoPanelValue"><textarea style="width:100%;height: 40px;" readonly="true">'+ jsonData.minisite.public_link +'</textarea></td>\
                     </tr>\
                     <tr>\
                         <td class="infoPanelLabel">'+MessageHash['share_center.61']+'</td>\
-                        <td class="infoPanelValue"><textarea style="width:100%;height: 80px;" id="embed_code"></textarea></td>\
+                        <td class="infoPanelValue"><textarea style="width:100%;height: 80px;" id="embed_code" readonly="true"></textarea></td>\
                     </tr>\
                     ';
                 }

diff --git a/core/src/plugins/boot.conf/manifest.xml b/core/src/plugins/boot.conf/manifest.xml
@@ -26,9 +26,9 @@
         <global_param group="&lt;span class='icon-save'&gt;&lt;/span&gt; Configurations storage" name="StorageLegend" type="legend" label="" description="How the application configuration data will be stored (users, plugins, etc. &lt;b&gt;not&lt;/b&gt; how your actual documents are managed). To get started rapidly, select No Database. To enable more advanced features, configure a database connexion."/>
         <global_param group="&lt;span class='icon-save'&gt;&lt;/span&gt; Configurations storage" name="STORAGE_TYPE" type="group_switch:storage_type" label="Storage Type" description="Select how the configurations will be stored." default="" mandatory="false"/>
         <global_param group_switch_name="storage_type" group_switch_label="No Database (Quick Start)" group_switch_value="serial" name="type" default="serial" label="No Database" description="h" type="hidden" mandatory="true"/>
-        <global_param group_switch_name="storage_type" group_switch_label="Database (Requires MySQL or SQLite)" group_switch_value="db" name="type" default="db" label="Database" description="Driver type (do not touch)" type="hidden" mandatory="true"/>
+        <global_param group_switch_name="storage_type" group_switch_label="Database (Requires MySQL, PostgreSQL or SQLite)" group_switch_value="db" name="type" default="db" label="Database" description="Driver type (do not touch)" type="hidden" mandatory="true"/>
         <global_param group_switch_name="storage_type" group_switch_label="Enable Notifications" group_switch_value="db" name="notifications" default="true" label="Enable Notifications" description="Log all events and alerts" type="boolean" mandatory="false"/>
-        <global_param group_switch_name="storage_type" group_switch_label="Database" group_switch_value="db" name="db_type" default="mysql" label="Database" description="Driver type (do not touch)" type="group_switch:dibi_provider" mandatory="true" choices="mysql|MySQL,sqlite3|Sqlite 3"/>
+        <global_param group_switch_name="storage_type" group_switch_label="Database" group_switch_value="db" name="db_type" default="mysql" label="Database" description="Driver type (do not touch)" type="group_switch:dibi_provider" mandatory="true" choices="mysql|MySQL,sqlite3|Sqlite 3,postgre|PostgreSQL"/>
         <global_param group_switch_name="storage_type" group_switch_label="Database" group_switch_value="db" type="button" name="TEST_SQL" choices="boot_test_sql_connexion" label="CONF_MESSAGE[Test SQL Connexion]" description="CONF_MESSAGE[Try connecting to the database]" mandatory="false"/>
         <global_param group="&lt;span class='icon-group'&gt;&lt;/span&gt; Add some users" name="usersLegend" type="legend" label="" description="Create users for your organization right now. You can do this later by going to the Settings workspace."/>
         <global_param group="&lt;span class='icon-group'&gt;&lt;/span&gt; Add some users" name="USER_LOGIN" type="string" label="Login" replicationGroup="users" description="Alphanumeric login"/>

diff --git a/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml b/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml
@@ -58,16 +58,16 @@
         <server_settings uuidAttr="name">
             <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_driver" default="mysql" label="Driver" description="Driver type (do not touch)" type="hidden" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_host" default="localhost" label="Host" description="Database server" type="string" mandatory="true"/>
-            <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_database" default="ajaxplorer" label="Database" description="Database name" type="string" mandatory="true"/>
+            <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_database" default="pydio" label="Database" description="Database name" type="string" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_username" default="" label="User" description="User name" type="string" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="MySQL" group_switch_value="mysql" name="mysql_password" default="" label="Password" description="User password" type="password" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_driver" default="sqlite3" label="Driver" description="Driver type (do not touch)" type="hidden" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_formatDate" default="'Y-m-d'" label="formatDate" description="formatDate (do not touch)" type="hidden" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_formatDateTime" default="'Y-m-d H:i:s'" label="formatDateTime" description="formatDateTime (do not touch)" type="hidden" mandatory="true"/>
-            <global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_database" default="AJXP_DATA_PATH/plugins/conf.sql/ajaxplorer.db" label="File" description="Database file" type="string" mandatory="true"/>
+            <global_param group_switch_name="dibi_provider" group_switch_label="Sqlite 3" group_switch_value="sqlite3" name="sqlite3_database" default="AJXP_DATA_PATH/plugins/conf.sql/pydio.db" label="File" description="Database file" type="string" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="PostgreSQL" group_switch_value="postgre" name="postgre_driver" default="postgre" label="Driver" description="Driver type (do not touch)" type="hidden" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="PostgreSQL" group_switch_value="postgre" name="postgre_host" default="localhost" label="Host" description="Database server" type="string" mandatory="true"/>
-            <global_param group_switch_name="dibi_provider" group_switch_label="PostgreSQL" group_switch_value="postgre" name="postgre_database" default="ajaxplorer" label="Database" description="Database name" type="string" mandatory="true"/>
+            <global_param group_switch_name="dibi_provider" group_switch_label="PostgreSQL" group_switch_value="postgre" name="postgre_database" default="pydio" label="Database" description="Database name" type="string" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="PostgreSQL" group_switch_value="postgre" name="postgre_username" default="" label="User" description="User name" type="string" mandatory="true"/>
             <global_param group_switch_name="dibi_provider" group_switch_label="PostgreSQL" group_switch_value="postgre" name="postgre_password" default="" label="Password" description="User password" type="password" mandatory="true"/>
         </server_settings>