summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/admin_default/js/ui.init.js24
-rw-r--r--themes/admin_default/views/block.html.php4
2 files changed, 3 insertions, 25 deletions
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 23d6cdea..e59a5a0b 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -30,28 +30,4 @@ $(document).ready(function(){
}
}
});
-
- // Sortable dashboard blocks
- if ($(".ui-dialog-titlebar-close").length) {
- $(".gBlock *:first").addClass("gDraggable");
- $("#gContent").sortable({
- connectWith: ["#gSidebar"],
- cursor: "move",
- handle: $("div:first"),
- opacity: 0.6,
- placeholder: "gDropTarget",
- update: function() { console.log($(this).sortable("serialize")); }
- // @todo stop: function() { .ajax() }
- });
- $("#gSidebar").sortable({
- connectWith: ["#gContent"],
- containment: "document",
- cursor: "move",
- handle: $("div:first"),
- opacity: 0.6,
- placeholder: "gDropTarget",
- update: function() { console.log($(this).sortable("serialize")); }
- // @todo stop: function() { .ajax() }
- });
- }
});
diff --git a/themes/admin_default/views/block.html.php b/themes/admin_default/views/block.html.php
index b92675e3..0ab13b2e 100644
--- a/themes/admin_default/views/block.html.php
+++ b/themes/admin_default/views/block.html.php
@@ -1,10 +1,12 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="<?= $css_id ?>" class="gBlock ui-widget-dialog">
+<div block_id="<?= $id ?>" id="<?= $css_id ?>" class="gBlock ui-widget-dialog">
<div class="ui-dialog-titlebar ui-widget-header">
+ <? if ($css_id != "gBlockAdder"): ?>
<a href="<?= url::site("admin/dashboard/remove_block/$id?csrf=" . access::csrf_token()) ?>"
class="ui-dialog-titlebar-close">
<span class="ui-icon ui-icon-closethick">remove</span>
</a>
+ <? endif ?>
<?= $title ?>
</div>
<div class="gBlockContent">