diff options
| -rw-r--r-- | modules/gallery/controllers/combined.php (renamed from modules/gallery/controllers/javascript.php) | 4 | ||||
| -rw-r--r-- | modules/gallery/libraries/Theme_View.php | 2 | ||||
| -rw-r--r-- | modules/info/views/info_block.html.php | 75 | ||||
| -rw-r--r-- | themes/default/css/screen.css | 4 |
4 files changed, 40 insertions, 45 deletions
diff --git a/modules/gallery/controllers/javascript.php b/modules/gallery/controllers/combined.php index ba5cbf4b..510482db 100644 --- a/modules/gallery/controllers/javascript.php +++ b/modules/gallery/controllers/combined.php @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Javascript_Controller extends Controller { - public function combined($key) { +class Combined_Controller extends Controller { + public function javascript($key) { if (preg_match('/[^0-9a-f]/', $key)) { // The key can't contain non-hex, so just terminate early Kohana::show_404(); diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index c3acfeb3..25818821 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -207,7 +207,7 @@ class Theme_View_Core extends View { } // Handcraft the script link because html::script will add a .js extenstion - return "<script type=\"text/javascript\" src=\"" . url::site("javascript/combined/$key") . + return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") . "\"></script>"; } diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index 9f9ec5df..3a96937c 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -1,44 +1,35 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<table class="gMetadata"> - <tbody> - <tr> - <th><?= t("Title:") ?></th> - <td><?= p::clean($item->title) ?></td> - </tr> - <? if ($item->description): ?> - <tr> - <th><?= t("Description:") ?></th> - <td><?= p::clean($item->description) ?></td> - </tr> +<ul class="gMetadata"> + <li> + <strong class="caption"><?= t("Title:") ?></strong> + <?= p::clean($item->title) ?> + </li> + <? if ($item->description): ?> + <li> + <strong class="caption"><?= t("Description:") ?></strong> + <?= p::clean($item->description) ?> + </li> + <? endif ?> + <? if ($item->id != 1): ?> + <li> + <strong class="caption"><?= t("Folder name:") ?></strong> + <?= p::clean($item->name) ?> + </li> + <? endif ?> + <? if ($item->captured): ?> + <li> + <strong class="caption"><?= t("Captured:") ?></strong> + <?= date("M j, Y H:i:s", $item->captured)?> + </li> + <? endif ?> + <? if ($item->owner): ?> + <li> + <strong class="caption"><?= t("Owner:") ?></strong> + <? if ($item->owner->url): ?> + <a href="<?= $item->owner->url ?>"><?= p::clean($item->owner->full_name) ?></a> + <? else: ?> + <?= p::clean($item->owner->name) ?> <? endif ?> - <? if ($item->id != 1): ?> - <tr> - <th><?= t("Name:") ?></th> - <td><?= p::clean($item->name) ?></td> - </tr> - <? endif ?> - <? if ($item->id != 1): ?> - <? $parent = $item->parent(); ?> - <tr> - <th><?= t("Album: ") ?></th> - <td> - <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>"> - <?= p::clean($parent->title) ?> - </a> - </td> - </tr> - <? endif ?> - <? if ($item->captured): ?> - <tr> - <th><?= t("Captured:") ?></th> - <td><?= gallery::date_time($item->captured) ?></td> - </tr> - <? endif ?> - <? if ($item->owner): ?> - <tr> - <th><?= t("Owner:") ?></th> - <td><a href="#"><?= p::clean($item->owner->name) ?></a></td> - </tr> - <? endif ?> - </tbody> -</table> + </li> + <? endif ?> +</ul>
\ No newline at end of file diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index d3c4de6f..e37de70e 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -57,6 +57,10 @@ h2 { font-size: 1.2em; } +#gSidebar .gBlock li { + margin-bottom: .6em; +} + h3 { font-size: 1.2em; } |