diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-22 08:38:06 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-22 08:38:06 +0200 |
| commit | 317b7b98c094386407251c2baf8f6e7c391c7bff (patch) | |
| tree | 98898d791df3a10cf6f9c1c62fbce06d8c9a7de1 /modules/organize | |
| parent | 00b3ca82de3a4858745988943a46d07b1c0fd006 (diff) | |
| parent | f533aee1cc71e8db739406859ac0cf43dce030ec (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'modules/organize')
| -rw-r--r-- | modules/organize/controllers/organize.php | 4 | ||||
| -rw-r--r-- | modules/organize/views/organize.html.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 27852904..898be509 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -516,7 +516,7 @@ class Organize_Controller extends Controller { break; case "delete": - return array("description" => t("Delete selected photos and albums"), + return array("description" => t("Delete selected photos / albums"), "name" => t("Delete images in %name", array("name" => $item->title)), "type" => "delete", "runningMsg" => t("Delete images in progress"), @@ -537,4 +537,4 @@ class Organize_Controller extends Controller { throw new Exception("Operation '$operation' is not implmented"); } } -}
\ No newline at end of file +} diff --git a/modules/organize/views/organize.html.php b/modules/organize/views/organize.html.php index 65d67d04..1686d255 100644 --- a/modules/organize/views/organize.html.php +++ b/modules/organize/views/organize.html.php @@ -33,7 +33,7 @@ var CONFIRM_DELETE = "<?= t("Do you really want to delete the selected albums an <?= $album_tree ?> </div> <div id="gMicroThumbPanel" class="yui-u" - ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&offset=__OFFSET__") ?>"> + ref="<?= url::site("organize/content/__ITEM_ID__?width=__WIDTH__&height=__HEIGHT__&offset=__OFFSET__") ?>"> <ul id="gMicroThumbGrid"></ul> </div> <div id="gOrganizeEditDrawer" class="yui-u"> |