Update share panel layout, set link at the top

pydio · Jun 20, 2014 · d2c38e5 · d2c38e5
1 parent 3783c4c
commit d2c38e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/core/src/plugins/action.share/manifest.xml b/core/src/plugins/action.share/manifest.xml
@@ -165,6 +165,14 @@
                                     <div class="share_qrcode" style="margin-top:5px; clear:left; display:none;"></div>
                                 </div>
                             </div>
+                            <div id="share_generate" class="mode-minipub mode-minipriv" style="display:none;">
+                                <div class="dialogContentMainTitle" ajxp_message_id="share_center.29">AJXP_MESSAGE[share_center.29]</div>
+                                <div class="dialogLegend">Please review the link parameters below and click on the 'Generate' button</div>
+                                <div align="center" style="margin: 15px 0;text-align:center;">
+                                    <div align="center" id="generate_publiclet" class="largeButton" style="margin-bottom:15px;"><span class="icon-retweet" style="font-size:14px;"></span> <img style="display:none;" id="generate_image" src="AJXP_THEME_FOLDER/images/actions/16/share.png" height="16" width="16"/><span>AJXP_MESSAGE[309]</span></div>
+                                </div>
+                                <br style="clear:both;"/>
+                            </div>
                             <div class="mode-ws">
                                 <div class="dialogContentMainTitle" ajxp_message_id="share_center.28">AJXP_MESSAGE[share_center.28]</div>
                                 <div class="dialogLegend" style="margin:0 5px;" ajxp_message_id="share_center.36">AJXP_MESSAGE[share_center.36]</div>
@@ -173,7 +181,7 @@
                                 <div class="dialogContentMainTitle" id="minisite_dialogMainTitle" ajxp_message_id="share_center.69r">AJXP_MESSAGE[share_center.69r]</div>
                                 <div class="dialogLegend" style="margin:0 5px;"  id="minisite_dialogLegend" ajxp_message_id="share_center.70r">AJXP_MESSAGE[share_center.70r]</div>
                             </div>
-                            <div id="target_repository">
+                            <div id="target_repository" style="margin-bottom:15px;">
                                 <div class="SF_horizontal_fieldsRow" style="margin:0 5px;min-height: 20px;">
                                     <div class="SF_horizontal_labelRow">
                                         <div class="SF_label" ajxp_message_id="share_center.35" style="width:130px;" title="AJXP_MESSAGE[share_center.35]">AJXP_MESSAGE[share_center.35]</div>
@@ -212,12 +220,6 @@
                                         <input type="checkbox" style="clear:none;" id="simple_right_write" name="simple_right_write" class=""> <label class="" for="simple_right_write"> AJXP_MESSAGE[share_center.74]</label>
                                     </div>
                                 </div>
-                                <div id="share_generate" class="mode-minipub mode-minipriv" style="display:none;">
-                                    <div align="center" style="margin: 15px 0;text-align:center;">
-                                        <div align="center" id="generate_publiclet" class="largeButton" style="margin-bottom:15px;"><span class="icon-retweet" style="font-size:14px;"></span> <img style="display:none;" id="generate_image" src="AJXP_THEME_FOLDER/images/actions/16/share.png" height="16" width="16"/><span>AJXP_MESSAGE[309]</span></div>
-                                    </div>
-                                </div>
-                                <br style="clear:both;"/>
                             </div>
                             <div id="target_user_title" class="mode-ws" style="margin-top: 15px;">
                                 <div class="dialogContentMainTitle" ajxp_message_id="share_center.30" style="display:none;">AJXP_MESSAGE[share_center.30]</div>

diff --git a/core/src/plugins/action.share/res/i18n/fr.php b/core/src/plugins/action.share/res/i18n/fr.php
@@ -73,7 +73,7 @@
 "69"=> "Configurer le minisite",
 "70"=> "Utiliser les cases pour donner des droits aux utilisateurs lorsqu'ils accèdent au minisite. Si vous cochez 'Envoi' seulement, ceci peut servir de simple boite de réception.",
 "69r"=>"Configuration du minisite",
-"70r"=> "Libellés and permissions accordées aux utilisateurs accédant au lien",
+"70r"=>"Libellés and permissions accordées aux utilisateurs accédant au lien",
 "71"=> "Droits",
 "72"=> "Lister & Prévisualiser",
 "73"=> "Télécharger",