From 19292414b1f88f2387f5c8e8e5fa1df67ab60713 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Wed, 16 Dec 2015 11:15:37 +0100
Subject: [PATCH] Dev: added right content subview in label for code
 readability

---
 .../labels/_labelviewrightcontent_view.php    | 78 ++++++++++++++++
 .../views/admin/labels/labelview_view.php     | 92 ++-----------------
 2 files changed, 88 insertions(+), 82 deletions(-)
 create mode 100644 application/views/admin/labels/_labelviewrightcontent_view.php

diff --git a/application/views/admin/labels/_labelviewrightcontent_view.php b/application/views/admin/labels/_labelviewrightcontent_view.php
new file mode 100644
index 00000000000..a3a843c7958
--- /dev/null
+++ b/application/views/admin/labels/_labelviewrightcontent_view.php
@@ -0,0 +1,78 @@
+<div class="row">
+    <div class="col-sm-12 content-right text-center">
+        <div class="panel-group" id="accordion" role="tablist" style="margin-top: 20px">
+            <div class="panel panel-default" id="up_resmgmt">
+
+                <!-- Uploaded resources management -->
+                <div class="panel-heading" role="tab" id="headingOne">
+                    <h4 class="panel-title">
+                        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                            <?php eT("Uploaded resources management"); ?>
+                        </a>
+                    </h4>
+                </div> <!-- headingOne -->
+
+                <!-- Body -->
+                <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+                    <div class="panel-body">
+                        <div id="upload-form-container">
+
+                            <!-- Form browselabelresources -->
+                            <?php echo CHtml::form('third_party/kcfinder/browse.php?language='.sTranslateLangCode2CK(App()->language), 'get', array('id'=>'browselabelresources','class'=>'form30','name'=>'browselabelresources','target'=>'_blank')); ?>
+                                <ul class="list-unstyled">
+
+                                    <!-- Browse uploaded resources -->
+                                    <li>
+                                        <label>&nbsp;</label>
+                                        <div class="col-sm-6">
+                                            <?php echo CHtml::dropDownList('type', 'files', array('files' => gT('Files'), 'flash' => gT('Flash'), 'images' => gT('Images')), array('class'=>' form-control input-lg ') ); ?>
+                                        </div>
+                                        <div class="col-sm-5">
+                                            <input type='submit' class="btn btn-default" value="<?php eT("Browse uploaded resources") ?>" />
+                                        </div>
+                                    </li>
+
+                                    <!-- Export resources as ZIP archive -->
+                                    <li>
+                                        <label>&nbsp;</label>
+                                        <input class="btn btn-default" type='button'<?php echo hasResources($lid, 'label') === false ? ' disabled="disabled"' : '' ?>
+                                            onclick='window.open("<?php echo $this->createUrl("/admin/export/sa/resources/export/label/lid/$lid"); ?>", "_blank")'
+                                            value="<?php eT("Export resources as ZIP archive") ?>"  />
+                                    </li>
+                                </ul>
+                                <input type='hidden' name='lid' value='<?php echo $lid; ?>' />
+                            </form>
+
+                            <!-- Form importlabelresources -->
+                            <?php echo CHtml::form(array('admin/labels/sa/importlabelresources'), 'post', array(
+                                                                                                                'id'=>'importlabelresources',
+                                                                                                                'class'=>'form30',
+                                                                                                                'name'=>'importlabelresources',
+                                                                                                                'enctype'=>'multipart/form-data',
+                                                                                                                'onsubmit'=>'return validatefilename(this, "'.gT('Please select a file to import!', 'js').'");')); ?>
+                                <ul class="list-unstyled">
+
+                                    <!-- Select ZIP file -->
+                                    <li>
+                                        <label for='the_file'><?php eT("Select ZIP file:") ?></label>
+                                        <input id='the_file' name="the_file" type="file" />
+                                    </li>
+
+                                    <!-- Import resources ZIP archive -->
+                                    <li>
+                                        <label>&nbsp;</label>
+                                        <input class="btn btn-default" type='button' value='<?php eT("Import resources ZIP archive") ?>'
+                                            <?php echo !function_exists("zip_open") ? "onclick='alert(\"" . gT("zip library not supported by PHP, Import ZIP Disabled", "js") . "\");'" : "onclick='if (validatefilename(this.form,\"" . gT('Please select a file to import!', 'js') . "\")) { this.form.submit();}'" ?>/>
+                                    </li>
+                                </ul>
+
+                                <input type='hidden' name='lid' value='<?php echo $lid; ?>' />
+                                <input type='hidden' name='action' value='importlabelresources' />
+                            </form>
+                        </div> <!-- upload-form-container -->
+                    </div> <!-- panel-body -->
+                </div> <!-- collapseOne -->
+            </div> <!-- up_resmgmt -->
+        </div> <!-- accordion -->
+    </div> <!-- content-right -->
+</div> <!--row -->
diff --git a/application/views/admin/labels/labelview_view.php b/application/views/admin/labels/labelview_view.php
index afc0994ad27..9f3932e1b11 100644
--- a/application/views/admin/labels/labelview_view.php
+++ b/application/views/admin/labels/labelview_view.php
@@ -3,12 +3,12 @@
     var otherisreserved='<?php eT("Error: 'other' is a reserved keyword.",'js'); ?>';
     var quickaddtitle='<?php eT('Quick-add subquestion or answer items','js'); ?>';
 </script>
-<div class="col-lg-12 labels">
+<div class="col-sm-12 labels">
     <h3 class="pagetitle"><?php eT("Labels") ?></h3>
     <div class="row">
 
         <!-- Left content -->
-        <div class="col-lg-8 content-right text-center">
+        <div class="col-sm-8 content-right text-center">
 
             <!-- tabs -->
             <ul class="nav nav-tabs">
@@ -28,8 +28,15 @@
 
                 <!-- tab content -->
                 <?php $this->renderPartial("./labels/_labelviewtabcontent_view", array('lslanguages'=>$lslanguages, 'results'=>$results)); ?>
-
             </form>
+        </div>
+
+        <!-- Right content -->
+        <div class="col-sm-4">
+            <?php $this->renderPartial("./labels/_labelviewrightcontent_view", array('lid'=>$lid)); ?>
+        </div>
+    </div>
+</div>
 
 <div id='quickadd' style='display:none;'>
     <div style='float:left;'>
@@ -43,82 +50,3 @@
             </p>
         </div>
 </div>
-
-
-
-
-</div>
-
-
-
-<div class="col-lg-4">
-    <div class="row">
-        <div class="col-lg-12 content-right text-center">
-            <div class="panel-group" id="accordion" role="tablist" style="margin-top: 20px">
-                <div class="panel panel-default" id="up_resmgmt">
-
-                    <div class="panel-heading" role="tab" id="headingOne">
-                        <h4 class="panel-title">
-                            <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                                <?php eT("Uploaded resources management"); ?>
-                            </a>
-                        </h4>
-                    </div>
-
-                    <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
-                        <div class="panel-body">
-                            <div>
-                                <?php echo CHtml::form('third_party/kcfinder/browse.php?language='.sTranslateLangCode2CK(App()->language), 'get', array('id'=>'browselabelresources','class'=>'form30','name'=>'browselabelresources','target'=>'_blank')); ?>
-                                    <ul class="list-unstyled">
-                                        <li>
-                                            <label>&nbsp;</label>
-                                            <div class="col-sm-6">
-                                                <?php echo CHtml::dropDownList('type', 'files', array('files' => gT('Files'), 'flash' => gT('Flash'), 'images' => gT('Images')), array('class'=>' form-control input-lg ') ); ?>
-                                            </div>
-                                            <div class="col-sm-5">
-                                                <input type='submit' class="btn btn-default" value="<?php eT("Browse uploaded resources") ?>" />
-                                            </div>
-                                        </li>
-                                        <li>
-                                            <label>&nbsp;</label>
-                                            <input class="btn btn-default" type='button'<?php echo hasResources($lid, 'label') === false ? ' disabled="disabled"' : '' ?>
-                                                onclick='window.open("<?php echo $this->createUrl("/admin/export/sa/resources/export/label/lid/$lid"); ?>", "_blank")'
-                                                value="<?php eT("Export resources as ZIP archive") ?>"  />
-                                        </li>
-                                    </ul>
-                                    <input type='hidden' name='lid' value='<?php echo $lid; ?>' />
-                                </form>
-                                <?php echo CHtml::form(array('admin/labels/sa/importlabelresources'), 'post', array('id'=>'importlabelresources',
-                                                                                                          'class'=>'form30',
-                                                                                                          'name'=>'importlabelresources',
-                                                                                                          'enctype'=>'multipart/form-data',
-                                                                                                          'onsubmit'=>'return validatefilename(this, "'.gT('Please select a file to import!', 'js').'");')); ?>
-                                    <ul class="list-unstyled">
-                                        <li>
-                                            <label for='the_file'><?php eT("Select ZIP file:") ?></label>
-                                            <input id='the_file' name="the_file" type="file" />
-                                        </li>
-                                        <li>
-                                            <label>&nbsp;</label>
-                                            <input class="btn btn-default" type='button' value='<?php eT("Import resources ZIP archive") ?>'
-                                                <?php echo !function_exists("zip_open") ? "onclick='alert(\"" . gT("zip library not supported by PHP, Import ZIP Disabled", "js") . "\");'" : "onclick='if (validatefilename(this.form,\"" . gT('Please select a file to import!', 'js') . "\")) { this.form.submit();}'" ?>/>
-                                        </li>
-                                    </ul>
-                                    <input type='hidden' name='lid' value='<?php echo $lid; ?>' />
-                                    <input type='hidden' name='action' value='importlabelresources' />
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-</div>
-</div>
-
-
-
-
-</div>
-</div>