diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/exif/controllers/exif.php | 2 | ||||
| -rw-r--r-- | modules/exif/views/exif_dialog.html.php | 64 |
2 files changed, 9 insertions, 57 deletions
diff --git a/modules/exif/controllers/exif.php b/modules/exif/controllers/exif.php index ca2e4cab..88e4a8b0 100644 --- a/modules/exif/controllers/exif.php +++ b/modules/exif/controllers/exif.php @@ -26,7 +26,7 @@ class Exif_Controller extends Controller { access::required("view", $item); $view = new View("exif_dialog.html"); - $view->details = array("summary" => exif::get($item), "detail" => exif::get($item, false)); + $view->details = exif::get($item, false); print $view; } diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php index 8eb40caa..3f123303 100644 --- a/modules/exif/views/exif_dialog.html.php +++ b/modules/exif/views/exif_dialog.html.php @@ -1,42 +1,22 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<style> -/* Tabs ----------------------------------*/ -.ui-tabs {padding: .2em;} -.ui-tabs .ui-tabs-nav { padding: .2em .2em 0 .2em; position: relative; } -.ui-tabs .ui-tabs-nav li { float: left; border-bottom: 0 !important; margin: 0 .2em -1px 0; padding: 0; list-style: none; } -.ui-tabs .ui-tabs-nav li a { display:block; text-decoration: none; padding: .5em 1em; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: .1em; border-bottom: 0; } -.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border: 0; background: none; } -.ui-tabs .ui-tabs-hide { display: none !important; } -</style> -<script type="/text/javascript"> - $("#gExifData").ready(function() { - $('#gExifData').tabs(); - }); -</script> <h1 style="display: none;"><?= t("Photo Detail") ?></h1> -<div id="gExifData" class="ui-tabs ui-widget ui-widget-content ui-corner-all"> - <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"> - <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#gExifSummary"><?= t("Summary")?></a></li> - <li class="ui-state-default ui-corner-top"><a href="#gExifDetail"><?= t("Detail")?></a></li> - </ul> - <div id="gExifSummary" class="ui-tabs-panel ui-widget-content ui-corner-bottom"> +<div id="gExifData"> <table> <tbody> - <? for ($i = 0; $i < count($details["summary"]); $i++): ?> + <? for ($i = 0; $i < count($details); $i++): ?> <tr> <td class="gEven"> - <?= $details["summary"][$i]["caption"] ?> + <?= $details[$i]["caption"] ?> </td> <td class="gOdd"> - <?= $details["summary"][$i]["value"] ?> + <?= $details[$i]["value"] ?> </td> - <? if (!empty($details["summary"][++$i])): ?> + <? if (!empty($details[++$i])): ?> <td class="gEven"> - <?= $details["summary"][$i]["caption"] ?> + <?= $details[$i]["caption"] ?> </td> <td class="gOdd"> - <?= $details["summary"][$i]["value"] ?> + <?= $details[$i]["value"] ?> </td> <? else: ?> <td class="gEven"></td><td class="gOdd"></td> @@ -46,32 +26,4 @@ <? endfor ?> </tbody> </table> - </div> - <div id="gExifDetail" class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide"> - <table> - <tbody> - <? for ($i = 0; $i < count($details["detail"]); $i++): ?> - <tr> - <td class="gEven"> - <?= $details["detail"][$i]["caption"] ?> - </td> - <td class="gOdd"> - <?= $details["detail"][$i]["value"] ?> - </td> - <? if (!empty($details["detail"][++$i])): ?> - <td class="gEven"> - <?= $details["detail"][$i]["caption"] ?> - </td> - <td class="gOdd"> - <?= $details["detail"][$i]["value"] ?> - </td> - <? else: ?> - <td class="gEven"></td><td class="gOdd"></td> - <? endif ?> - </td> - </tr> - <? endfor ?> - </tbody> - </table> - </div> -</div>
\ No newline at end of file +</div> |