changed order of form fields in photo and album forms so that the confusing "name" field is not on top anymore

changed "name" label to "Filename" for photos and "Directory Name" for albums

1 files changed, 2 insertions, 2 deletions

diff --git a/core/helpers/photo.php b/core/helpers/photo.php
index a6934286..4f75ca0d 100644
--- a/core/helpers/photo.php
+++ b/core/helpers/photo.php
@@ -110,9 +110,9 @@ class photo_Core {
     $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddPhotoForm"));
     $group = $form->group("add_photo")->label(
       t("Add Photo to %album_title", array("album_title" =>$parent->title)));
-    $group->input("name")->label(t("Name"));
     $group->input("title")->label(t("Title"));
     $group->textarea("description")->label(t("Description"));
+    $group->input("name")->label(t("Filename"));
     $group->upload("file")->label(t("File"))->rules("required|allow[jpg,png,gif,flv,mp4]");
     $group->hidden("type")->value("photo");
     $group->submit("")->value(t("Upload"));
@@ -124,9 +124,9 @@ class photo_Core {
     $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
     $form->hidden("_method")->value("put");
     $group = $form->group("edit_photo")->label(t("Edit Photo"));
-    $group->input("name")->label(t("Name"))->value($photo->name);
     $group->input("title")->label(t("Title"))->value($photo->title);
     $group->textarea("description")->label(t("Description"))->value($photo->description);
+    $group->input("name")->label(t("Filename"))->value($photo->name);
     $group->submit("")->value(t("Modify"));
     $form->add_rules_from(ORM::factory("item"));
     return $form;