diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
| commit | 0733dc37fda27a5ba35f9020edf3c66aa41a95a0 (patch) | |
| tree | 6877946232f1b01b1c8709054c689f6658cef34f /modules/exif/views | |
| parent | 218493c50be9362d4abed6900a816308fee5d978 (diff) | |
| parent | 9379308f91a476f790fb8d444536719535c584e4 (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'modules/exif/views')
| -rw-r--r-- | modules/exif/views/exif_dialog.html.php | 24 | ||||
| -rw-r--r-- | modules/exif/views/exif_sidebar.html.php | 5 |
2 files changed, 14 insertions, 15 deletions
diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php index 11d1e212..22744e2d 100644 --- a/modules/exif/views/exif_dialog.html.php +++ b/modules/exif/views/exif_dialog.html.php @@ -1,30 +1,30 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<style> - #gExifData {font-size: .85em;} - .gOdd {background: #BDD2FF;} - .gEven {background: #DFEFFC;} +<style type="text/css"> + #g-exif-data { font-size: .85em; } + .g-odd { background: #bdd2ff; } + .g-even { background: #dfeffc; } </style> -<h1 style="display: none;"><?= t("Photo Detail") ?></h1> -<div id="gExifData"> - <table class="gMetadata" > +<h1 style="display: none;"><?= t("Photo detail") ?></h1> +<div id="g-exif-data"> + <table class="g-metadata" > <tbody> <? for ($i = 0; $i < count($details); $i++): ?> <tr> - <td class="gEven"> + <td class="g-even"> <?= $details[$i]["caption"] ?> </td> - <td class="gOdd"> + <td class="g-odd"> <?= html::clean($details[$i]["value"]) ?> </td> <? if (!empty($details[++$i])): ?> - <td class="gEven"> + <td class="g-even"> <?= $details[$i]["caption"] ?> </td> - <td class="gOdd"> + <td class="g-odd"> <?= html::clean($details[$i]["value"]) ?> </td> <? else: ?> - <td class="gEven"></td><td class="gOdd"></td> + <td class="g-even"></td><td class="g-odd"></td> <? endif ?> </tr> <? endfor ?> diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php index 60c0e1d4..8af2eb12 100644 --- a/modules/exif/views/exif_sidebar.html.php +++ b/modules/exif/views/exif_sidebar.html.php @@ -1,7 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<a id="gExifDataLink" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo Details")->for_html_attr() ?>" - class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> +<a id="g-exif-data-link" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo details")->for_html_attr() ?>" + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-info"></span> <?= t("View more information") ?> </a> - |