diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2008-12-24 00:20:26 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2008-12-24 00:20:26 +0000 |
| commit | 672eca53371b131484d00cbe6a069092d0b7f6b3 (patch) | |
| tree | 507cce76fc6dc9d022455eed9075e039fa779da2 /themes/default/views | |
| parent | c76d730a7c07253e7cc3224a78c616ce63989f40 (diff) | |
Lots of deltas rolled up into a bigger change. Sorry for the mess.
1) Deleted in-place-editing. We'll be replacing this with a real edit
system that groups settings together and is more coherent.
2) Tweaked the way that dialog boxes work to get the ajax stuff working
again. It's imperfect and does not work properly for uploading images.
This is going to get redone also, but this is a good resting point.
3) Created edit forms for albums and photos. Moved _update and _create out
of Items_Controller and into the individual subclasses.
4) Created access::required which is a shorthand for:
if (!access::can(...)) {
access::forbidden();
}
5) Added validation rules to Items_Model
6) Converted login to use the regular modal dialog approach in the theme.
Diffstat (limited to 'themes/default/views')
| -rw-r--r-- | themes/default/views/album.html.php | 6 | ||||
| -rw-r--r-- | themes/default/views/photo.html.php | 4 | ||||
| -rw-r--r-- | themes/default/views/tag.html.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php index d76e0618..fe974337 100644 --- a/themes/default/views/album.html.php +++ b/themes/default/views/album.html.php @@ -1,8 +1,8 @@ <? defined("SYSPATH") or die("No direct script access."); ?> <div id="gAlbumHeader"> <?= $theme->album_top() ?> - <h1><?= $item->title_edit ?></h1> - <div class="gDescription"><?= $item->description_edit ?></div> + <h1><?= $item->title ?></h1> + <div class="gDescription"><?= $item->description ?></div> </div> <ul id="gAlbumGrid"> @@ -19,7 +19,7 @@ width="<?= $child->thumb_width ?>" height="<?= $child->thumb_height ?>" /> </a> - <h2><?= $child->title_edit ?></h2> + <h2><?= $child->title ?></h2> <?= $theme->thumb_bottom($child) ?> <ul class="gMetadata"> <?= $theme->thumb_info($child) ?> diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php index 8b00f0a5..7cfe542a 100644 --- a/themes/default/views/photo.html.php +++ b/themes/default/views/photo.html.php @@ -1,14 +1,14 @@ <? defined("SYSPATH") or die("No direct script access."); ?> <div id="gItemHeader"> <?= $theme->photo_top() ?> - <h1><?= $item->title_edit ?></h1> + <h1><?= $item->title ?></h1> </div> <div id="gItem"> <img id="gPhotoID-<?= $item->id ?>" alt="<?= $item->title ?>" src="<?= $item->resize_url() ?>" width="<?= $item->resize_width ?>" height="<?= $item->resize_height ?>" /> - <div><?= $item->description_edit ?></div> + <div><?= $item->description ?></div> <?= $theme->photo_bottom() ?> </div> diff --git a/themes/default/views/tag.html.php b/themes/default/views/tag.html.php index 6be16e43..ac33e092 100644 --- a/themes/default/views/tag.html.php +++ b/themes/default/views/tag.html.php @@ -20,7 +20,7 @@ width="<?= $child->thumb_width ?>" height="<?= $child->thumb_height ?>" /> </a> - <h2><?= $child->title_edit ?></h2> + <h2><?= $child->title ?></h2> <?= $theme->thumb_bottom($child) ?> <ul class="gMetadata"> <?= $theme->thumb_info($child) ?> |
