Merge pull request #5 from codexilab/develop

adrianolmedo · web-flow · commit 2d6f4e816248 · 2021-10-02T18:38:33.000-04:00
v1.0.3: minor changes
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 XenoTrue
+Copyright (c) 2021 CodexiLab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-# XenoTrue Online Banners
+# Banners
 An Osclass plugin to manage banners and its positions in the site.
 
-![XenoTrue Online Banners](https://i.imgur.com/kCN4ofw.png)
+![Banners](https://i.imgur.com/kCN4ofw.png)
 
 ## Copyright and Licenses
-Copyright 2020 XenoTrue. Code released under the MIT license.
+Copyright 2021 CodexiLab. Code released under the MIT license.
diff --git a/banners/CHANGELOG.md b/banners/CHANGELOG.md
@@ -1,6 +1,13 @@
-# XenoTrue Online Banners
+# Banners
 ====================
 
+## [1.0.3] 2021-10-02
+
+### Changed
+
+- Window sizes to +100px larger.
+- Name of project.
+
 ## [1.0.2] 2020-08-21
 
 ### Fixed
diff --git a/banners/LICENSE b/banners/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 XenoTrue
+Copyright (c) 2021 CodexiLab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/README.md b/banners/README.md
diff --git a/banners/ajax/ajax.php b/banners/ajax/ajax.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/classes/datatables/BannersDataTable.php b/banners/classes/datatables/BannersDataTable.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
@@ -172,7 +172,7 @@ private function processData($banners)
 
 					$banner = '';
 					if ($aRow['b_image']) {
-						$banner = '<div class="text-center"><a href="#" onclick="show_banner(\''.BANNERS_ROUTE_SOURCES.$aRow['s_name'].'.'.$aRow['s_extension'].'\');return false;">' . __('View', BANNERS_PREF) . '</a><br>'.$aRow['s_content_type'].'</div>';
+						$banner = '<div class="text-center"><a href="#" onclick="show_banner(\''.BANNERS_ROUTE_SOURCES.$aRow['s_name'].'.'.$aRow['s_extension'].'\');return false;">' . __('View', BANNERS_PREF) . '</a><div>'.$aRow['s_content_type'].'</div></div>';
 					} else {
 						$banner = '<div class="text-center">'.htmlentities("</script>").'</div>';
 					}
diff --git a/banners/controller/admin/advertisers.php b/banners/controller/admin/advertisers.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/controller/admin/banners.php b/banners/controller/admin/banners.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/controller/admin/positions.php b/banners/controller/admin/positions.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/controller/admin/set-banner.php b/banners/controller/admin/set-banner.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/controller/admin/settings.php b/banners/controller/admin/settings.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/helpers/hUtils.php b/banners/helpers/hUtils.php
@@ -2,7 +2,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/index.php b/banners/index.php
@@ -2,7 +2,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
@@ -24,14 +24,14 @@
 	 */
 
 /*
-Plugin Name: XenoTrue Online Banners
-Plugin URI: https://gitlab.com/xenotrue/development/osclass_plug_xt-banners
+Plugin Name: Banners
+Plugin URI: https://github.com/codexilab/osclass-banners
 Description: Put banners on the site, in any format and check its display time
-Version: 1.0.2
-Author: XenoTrue
-Author URI: https://gitlab.com/xenotrue
+Version: 1.0.3
+Author: CodexiLab
+Author URI: https://github.com/codexilab
 Short Name: banners
-Plugin update URI: https://gitlab.com/xenotrue/development/osclass_plug_xt-banners
+Plugin update URI: https://github.com/codexilab/osclass-banners/
 */
 
 // Paths
diff --git a/banners/model/Banners.php b/banners/model/Banners.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/oc-load.php b/banners/oc-load.php
@@ -2,7 +2,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/parts/admin/modals_form_options.php b/banners/parts/admin/modals_form_options.php
@@ -3,7 +3,7 @@
     /*
      * MIT License
      * 
-     * Copyright (c) 2020 XenoTrue
+     * Copyright (c) 2021 CodexiLab
      * 
      * Permission is hereby granted, free of charge, to any person obtaining a copy
      * of this software and associated documentation files (the "Software"), to deal
@@ -26,23 +26,23 @@
 
 ?>
 
-<form id="modal-500px" method="post" action="" class="has-form-actions hide"></form>
+<form id="modal-700px" method="post" action="" class="has-form-actions hide"></form>
 
-<form id="modal-300px" method="post" action="" class="has-form-actions hide"></form>
+<form id="modal-400px" method="post" action="" class="has-form-actions hide"></form>
 
 <script>
 	$(document).ready(function() {
-		$("#modal-500px").dialog({
+		$("#modal-700px").dialog({
 	        autoOpen: false,
-	        width: "500px",
+	        width: "700px",
 	        modal: true,
 	        title: '<?php echo osc_esc_js( __('Banners', BANNERS_PREF) ); ?>',
             position: "top"
 	    });
 
-	    $("#modal-300px").dialog({
+	    $("#modal-400px").dialog({
 	        autoOpen: false,
-	        width: "300px",
+	        width: "400px",
 	        modal: true,
 	        title: '<?php echo osc_esc_js( __('Banners', BANNERS_PREF) ); ?>',
             position: "top"
@@ -54,20 +54,20 @@ function loading_modal() {
 	}
 
 	function set_advertiser(advertiser_id = null) {
-        $("#modal-500px").html(loading_modal());
-        $('#modal-500px').dialog('open');
+        $("#modal-700px").html(loading_modal());
+        $('#modal-700px').dialog('open');
         var url = '<?php echo osc_base_url(); ?>index.php?page=ajax&action=runhook&hook=banners_controller_requests&route=set_advertiser_iframe&id='+advertiser_id;
         $.ajax({
             method: "GET",
             url: url,
             dataType: "html"
         }).done(function(data) {
-            $("#modal-500px").html(data);
+            $("#modal-700px").html(data);
         });
 	};
 
 	function set_position(id = null) {
-        var modal = (id == null) ? '#modal-300px' : '#modal-500px';
+        var modal = (id == null) ? '#modal-400px' : '#modal-700px';
         $(modal).html(loading_modal());
 	    $(modal).dialog('open');
 	    var url = '<?php echo osc_base_url(); ?>index.php?page=ajax&action=runhook&hook=banners_controller_requests&route=set_position_iframe&id='+id;
diff --git a/banners/views/admin/advertisers.php b/banners/views/admin/advertisers.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/views/admin/banners.php b/banners/views/admin/banners.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
@@ -497,8 +497,8 @@ function show_banner(img) {
 
 // Note: this function can be moved to modals_form_options
 function show_position(id = null, year = null, month = null) {
-    $("#modal-300px").html('<div id="show-calendar-content" class="text-center"></div>'); show_calendar(id, year, month);
-    $('#modal-300px').dialog('open');
+    $("#modal-400px").html('<div id="show-calendar-content" class="text-center"></div>'); show_calendar(id, year, month);
+    $('#modal-400px').dialog('open');
 };
 
 // dialog delete function
diff --git a/banners/views/admin/position_calendar_iframe.php b/banners/views/admin/position_calendar_iframe.php
@@ -3,7 +3,7 @@
     /*
      * MIT License
      * 
-     * Copyright (c) 2020 XenoTrue
+     * Copyright (c) 2021 CodexiLab
      * 
      * Permission is hereby granted, free of charge, to any person obtaining a copy
      * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/views/admin/positions.php b/banners/views/admin/positions.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/views/admin/set-banner.php b/banners/views/admin/set-banner.php
@@ -3,7 +3,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal
diff --git a/banners/views/admin/set_advertiser_iframe.php b/banners/views/admin/set_advertiser_iframe.php
@@ -3,7 +3,7 @@
     /*
      * MIT License
      * 
-     * Copyright (c) 2020 XenoTrue
+     * Copyright (c) 2021 CodexiLab
      * 
      * Permission is hereby granted, free of charge, to any person obtaining a copy
      * of this software and associated documentation files (the "Software"), to deal
@@ -59,7 +59,7 @@
         </div>
         <div class="form-actions">
             <div class="wrapper">
-                <a class="btn button-close" href="javascript:void(0);" onclick="$('#modal-500px').dialog('close');"><?php _e('Cancel'); ?></a>
+                <a class="btn button-close" href="javascript:void(0);" onclick="$('#modal-700px').dialog('close');"><?php _e('Cancel'); ?></a>
                 <input type="submit" value="<?php echo ($advertiserToUpdate) ? __('Update advertiser', BANNERS_PREF) : __('Add new advertiser', BANNERS_PREF); ?>" class="btn btn-submit">
             </div>
         </div>
diff --git a/banners/views/admin/set_position_iframe.php b/banners/views/admin/set_position_iframe.php
@@ -3,7 +3,7 @@
     /*
      * MIT License
      * 
-     * Copyright (c) 2020 XenoTrue
+     * Copyright (c) 2021 CodexiLab
      * 
      * Permission is hereby granted, free of charge, to any person obtaining a copy
      * of this software and associated documentation files (the "Software"), to deal
@@ -69,7 +69,7 @@
 
     <div class="form-actions">
         <div class="wrapper">
-            <a class="btn btn-mini button-close" href="javascript:void(0);" onclick="$('#modal-500px, #modal-300px').dialog('close');"><?php _e('Close') ?></a>
+            <a class="btn btn-mini button-close" href="javascript:void(0);" onclick="$('#modal-700px, #modal-400px').dialog('close');"><?php _e('Close') ?></a>
             <input type="submit" value="<?php ((!$positionToUpdate) ? _e('Add position', BANNERS_PREF) : _e('Save changes')); ?>" class="btn btn-mini btn-submit">
             <?php if ($positionToUpdate) : ?>
             <a href="#" onclick="delete_position(<?php if (isset($positionToUpdate['pk_i_id'])) echo $positionToUpdate['pk_i_id']; ?>);return false;" class="btn btn-mini btn-red"><?php _e('Delete'); ?></a>
diff --git a/banners/views/admin/settings.php b/banners/views/admin/settings.php
@@ -2,7 +2,7 @@
 	/*
 	 * MIT License
 	 * 
-	 * Copyright (c) 2020 XenoTrue
+	 * Copyright (c) 2021 CodexiLab
 	 * 
 	 * Permission is hereby granted, free of charge, to any person obtaining a copy
 	 * of this software and associated documentation files (the "Software"), to deal

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/*`
`4`	`4`	`* MIT License`
`5`	`5`	`*`
`6`		`- * Copyright (c) 2020 XenoTrue`
	`6`	`+ * Copyright (c) 2021 CodexiLab`
`7`	`7`	`*`
`8`	`8`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`9`	`9`	`* of this software and associated documentation files (the "Software"), to deal`