Merge pull sync with scoumbourdis/master

mckaygerhard · web-flow · commit 90f64a4d64b9 · 2018-04-01T19:31:05.000-04:00
sync with oficial GC
diff --git a/application/libraries/Grocery_CRUD.php b/application/libraries/Grocery_CRUD.php
diff --git a/application/views/example.php b/application/views/example.php
@@ -7,9 +7,6 @@
 foreach($css_files as $file): ?>
 	<link type="text/css" rel="stylesheet" href="<?php echo $file; ?>" />
 <?php endforeach; ?>
-<?php foreach($js_files as $file): ?>
-	<script src="<?php echo $file; ?>"></script>
-<?php endforeach; ?>
 </head>
 <body>
 	<div>
@@ -23,8 +20,11 @@
 		
 	</div>
 	<div style='height:20px;'></div>  
-    <div>
+    <div style="padding: 10px">
 		<?php echo $output; ?>
     </div>
+    <?php foreach($js_files as $file): ?>
+        <script src="<?php echo $file; ?>"></script>
+    <?php endforeach; ?>
 </body>
 </html>
diff --git a/assets/grocery_crud/languages/add-new-lang-string.sh b/assets/grocery_crud/languages/add-new-lang-string.sh
@@ -2,7 +2,6 @@
 for i in *.php
 do
    echo "\n" >> $i
-   echo "\t/* Added in version 1.5.8 */" >> $i
-   echo "\t\$lang['alert_delete_multiple'] = 'Are you sure that you want to delete those {items_amount} items?';\n" >> $i
-   echo "\t\$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';\n" >> $i
+   echo "\t/* Added in version 1.6.1 */" >> $i
+   echo "\t\$lang['list_clone'] = 'Clone';\n" >> $i
 done
diff --git a/assets/grocery_crud/languages/afrikaans.php b/assets/grocery_crud/languages/afrikaans.php
@@ -95,3 +95,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/arabic.php b/assets/grocery_crud/languages/arabic.php
@@ -95,3 +95,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/bengali.php b/assets/grocery_crud/languages/bengali.php
@@ -97,3 +97,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/bulgarian.php b/assets/grocery_crud/languages/bulgarian.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/catalan.php b/assets/grocery_crud/languages/catalan.php
@@ -96,3 +96,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Estas segur que vols esborrar aquest item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/chinese.php b/assets/grocery_crud/languages/chinese.php
@@ -95,3 +95,8 @@
 
 	$lang['alert_delete_multiple_one'] = '你确定要删除此一项吗?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/croatian.php b/assets/grocery_crud/languages/croatian.php
@@ -97,3 +97,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/czech.php b/assets/grocery_crud/languages/czech.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/danish.php b/assets/grocery_crud/languages/danish.php
@@ -95,3 +95,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/dutch.php b/assets/grocery_crud/languages/dutch.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/english.php b/assets/grocery_crud/languages/english.php
@@ -92,3 +92,6 @@
 	$lang['alert_delete_multiple'] = 'Are you sure that you want to delete those {items_amount} items?';
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/french.php b/assets/grocery_crud/languages/french.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Êtes-vous sûr de vouloir supprimer cet élément ?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/german.php b/assets/grocery_crud/languages/german.php
@@ -93,3 +93,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/greek.php b/assets/grocery_crud/languages/greek.php
@@ -92,3 +92,6 @@
 	$lang['alert_delete_multiple'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε τις {items_amount} επιλεγμένες εγγραφές?';
 	$lang['alert_delete_multiple_one'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε την επιλεγμένη εγγραφή?';
 
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Αντιγραφή';
+
diff --git a/assets/grocery_crud/languages/hindi.php b/assets/grocery_crud/languages/hindi.php
@@ -96,3 +96,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/hungarian.php b/assets/grocery_crud/languages/hungarian.php
@@ -96,3 +96,8 @@
 	$lang['alert_delete_multiple'] = 'Biztosan törölni szeretne {items_amount} tételt?';
 
 	$lang['alert_delete_multiple_one'] = 'Biztosan törölni szeretné a kijelölt tételt?';
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/indonesian.php b/assets/grocery_crud/languages/indonesian.php
@@ -98,3 +98,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/italian.php b/assets/grocery_crud/languages/italian.php
@@ -79,3 +79,8 @@
 
 	$lang['alert_delete_multiple_one'] 	= 'Sei sicuro di voler eliminare l\'elemento selezionato?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/japanese.php b/assets/grocery_crud/languages/japanese.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = '本当にこの 1 行を削除しますか?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/korean.php b/assets/grocery_crud/languages/korean.php
@@ -93,3 +93,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/lithuanian.php b/assets/grocery_crud/languages/lithuanian.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/mongolian.php b/assets/grocery_crud/languages/mongolian.php
@@ -95,3 +95,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/norwegian.php b/assets/grocery_crud/languages/norwegian.php
@@ -95,3 +95,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/persian.php b/assets/grocery_crud/languages/persian.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/polish.php b/assets/grocery_crud/languages/polish.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/pt-br.portuguese.php b/assets/grocery_crud/languages/pt-br.portuguese.php
@@ -95,3 +95,8 @@
 
 $lang['alert_delete_multiple_one'] = 'Tem certeza que deseja excluir esse item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/pt-pt.portuguese.php b/assets/grocery_crud/languages/pt-pt.portuguese.php
@@ -95,3 +95,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/romanian.php b/assets/grocery_crud/languages/romanian.php
@@ -93,3 +93,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/russian.php b/assets/grocery_crud/languages/russian.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/slovak.php b/assets/grocery_crud/languages/slovak.php
@@ -93,3 +93,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/spanish.php b/assets/grocery_crud/languages/spanish.php
@@ -93,3 +93,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/thai.php b/assets/grocery_crud/languages/thai.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/turkish.php b/assets/grocery_crud/languages/turkish.php
@@ -95,3 +95,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/ukrainian.php b/assets/grocery_crud/languages/ukrainian.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/languages/vietnamese.php b/assets/grocery_crud/languages/vietnamese.php
@@ -94,3 +94,8 @@
 
 	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
 
+
+
+	/* Added in version 1.6.1 */
+	$lang['list_clone'] = 'Clone';
+
diff --git a/assets/grocery_crud/themes/datatables/views/list.php b/assets/grocery_crud/themes/datatables/views/list.php
@@ -35,12 +35,20 @@
 					</a>
 				<?php }?>
 
+                <?php if(!$unset_clone){?>
+                    <a href="<?php echo $row->clone_url?>" class="edit_button ui-button ui-widget ui-state-default ui-corner-all ui-button-text-icon-primary" role="button">
+                        <span class="ui-button-icon-primary ui-icon ui-icon-copy"></span>
+                        <span class="ui-button-text">&nbsp;<?php echo $this->l('list_clone'); ?></span>
+                    </a>
+                <?php }?>
+
 				<?php if(!$unset_edit){?>
 					<a href="<?php echo $row->edit_url?>" class="edit_button ui-button ui-widget ui-state-default ui-corner-all ui-button-text-icon-primary" role="button">
 						<span class="ui-button-icon-primary ui-icon ui-icon-pencil"></span>
 						<span class="ui-button-text">&nbsp;<?php echo $this->l('list_edit'); ?></span>
 					</a>
 				<?php }?>
+
 				<?php if(!$unset_delete){?>
 					<a onclick = "javascript: return delete_row('<?php echo $row->delete_url?>', '<?php echo $num_row?>')"
 						href="javascript:void(0)" class="delete_button ui-button ui-widget ui-state-default ui-corner-all ui-button-text-icon-primary" role="button">
diff --git a/assets/grocery_crud/themes/flexigrid/css/flexigrid.css b/assets/grocery_crud/themes/flexigrid/css/flexigrid.css
diff --git a/assets/grocery_crud/themes/flexigrid/css/images/clone.png b/assets/grocery_crud/themes/flexigrid/css/images/clone.png
diff --git a/assets/grocery_crud/themes/flexigrid/views/list.php b/assets/grocery_crud/themes/flexigrid/views/list.php
diff --git a/change_log.txt b/change_log.txt
