diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-03 13:56:04 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-04 08:23:02 -0800 |
| commit | 95b26db82c3f835f66cdb32aef13aa84a6a206e5 (patch) | |
| tree | a407d6eae6e31148b0916666544a53a417e16084 /modules/organize/views | |
| parent | aa4ed454737d45bf8140fd84f2eea2e04ed4a7d6 (diff) | |
1) Simplify the layout of the organize dialog content.
2) Use CSS to layout the thmbnail grid to the full dialog size. Fixes ticker #848.
3) Separate css that can be themed into organize_theme.css. This isolates the themed components into a separate file for easy of overriding by a theme.
Diffstat (limited to 'modules/organize/views')
| -rw-r--r-- | modules/organize/views/organize_dialog.html.php | 10 | ||||
| -rw-r--r-- | modules/organize/views/organize_thumb_grid.html.php | 12 |
2 files changed, 9 insertions, 13 deletions
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 435f5ae3..3d824886 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -15,14 +15,12 @@ </ul> </div> <div id="g-organize-detail" class="g-left ui-helper-clearfix"> - <div id="g-organize-microthumb-panel" class="ui-widget" + <ul id="g-action-status" class="g-message-block"> + <li class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></li> + </ul> + <div id="g-organize-microthumb-grid" class="ui-widget" ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>"> - <ul id="g-action-status" class="g-message-block"> - <li class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></li> - </ul> - <ul id="g-organize-microthumb-grid" class="ui-widget-content"> <?= $micro_thumb_grid ?> - </ul> </div> <div id="g-organize-controls" class="ui-widget-header"> <a id="g-organize-close" href="#" ref="done" diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php index f29680f7..f5db53d4 100644 --- a/modules/organize/views/organize_thumb_grid.html.php +++ b/modules/organize/views/organize_thumb_grid.html.php @@ -1,12 +1,10 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <? foreach ($album->children(25, $offset) as $child): ?> -<li class="g-organize-microthumb-grid-cell g-left ui-state-default ui-state-active" ref="<?= $child->id ?>"> - <!-- div id="g-organize-microthumb-<?= $child->id ?>" - class="g-organize-microthumb <?= $child->is_album() ? "g-album" : "g-photo" ?> ui-state-active" --> - <?= $child->thumb_img(array("class" => "g-thumbnail", "ref" => $child->id), 90, true) ?> - <span<?= $child->is_album() ? " class=\"ui-icon ui-icon-note\"" : "" ?>></span> - <!-- /div --> -</li> +<div class="g-organize-microthumb-grid-cell g-left ui-state-default ui-state-active <?= $child->is_album() ? "g-album" : "g-photo" ?>" + ref="<?= $child->id ?>"> + <?= $child->thumb_img(array("class" => "g-thumbnail", "ref" => $child->id), 90, true) ?> + <span<?= $child->is_album() ? " class=\"ui-icon ui-icon-note\"" : "" ?>></span> +</div> <? endforeach ?> <? if ($album->children_count() > $offset): ?> |