stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-16 11:54:44 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Major refactor of organize:

Browse Source 
* Clean up naming conventions for variables in the controller
  so that we specifically refer to albums with $album_id, etc.

* Move complexity for drawing tree out of the controller and into
  the view.

* Simplify task definitions to get rid of extraneous text

* Change __PLACEHOLDERS__ to clearly define which is the album
  and which is the item that we're moving before/after

* Remove as many CSS ids as we can from the tree view to keep
  things simple
This commit is contained in:
Bharat Mediratta
2009-08-29 10:00:47 -07:00
parent acce8cbafd
commit f257cd3d69
6 changed files with 140 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/organize/views/organize_dialog.html.php
+4 -5
View File
@@ -1,8 +1,8 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<script type="text/javascript">
var move_url = "<?= url::site("organize/move/__TARGET_ID__?csrf=$csrf") ?>";
var move_url = "<?= url::site("organize/move_to/__ALBUM_ID__?csrf=$csrf") ?>";
var rearrange_url = "<?= url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf") ?>";
var sort_order_url = "<?= url::site("organize/resort/$album->id/__COL__/__DIR__?csrf=$csrf") ?>";
var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
</script>
<div id="gOrganize" class="gDialogPanel">
<h1 style="display:none"><?= t("Organize %name", array("name" => p::purify($album->title))) ?></h1>
@@ -23,7 +23,7 @@
</div>
<div id="gOrganizeDetail" class="yui-u">
<div id="gMicroThumbPanel"
ref="<?= url::site("organize/content/__ITEM_ID__/__OFFSET__") ?>">
ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
<ul id="gMicroThumbGrid">
<?= $micro_thumb_grid ?>
</ul>
@@ -34,12 +34,11 @@
<form>
<?= t("Sort order") ?>
<?= form::dropdown(array("id" => "gOrganizeSortColumn"), album::get_sort_order_options(), $album->sort_column) ?>
<?= form::dropdown(array("id" => "gOrganizeSortDir"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
<?= form::dropdown(array("id" => "gOrganizeSortOrder"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
</form>
</div>
<div id="gOrganizeProgress" style="display: none">
<div class="gProgressBar"></div>
<div id="gStatus"></div>
</div>
</div>
</div>