[frio] Restyle album edit header. (#5426)

diff --git a/mod/photos.php b/mod/photos.php
index 74457d6ac13b33204f3009400484d1feaa6f0324..8798cbb7a8836c9395fc0ee69d5d2a8817724da0 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -221,7 +221,7 @@ function photos_post(App $a)
                        // Update the photo albums cache
                        Photo::clearAlbumCache($page_owner_uid);
 
-                       $newurl = str_replace(bin2hex($album), bin2hex($newalbum), $_SESSION['photo_return']);
+                       $newurl = System::baseUrl() . '/photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum);
                        goaway($newurl);
                        return; // NOTREACHED
                }

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index dd464be09406e4d2d4f2a6f227f54fc6c454a80f..59d8826695393e0befb439614eb4dae62367339b 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2470,6 +2470,13 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
 }
 
 /* photos */
+#photo-album-edit-name-label {
+    width: 100%;
+}
+.photo-album-edit-name {
+    width: 60%;
+}
+
 .photo-album-actions {
     margin-bottom: 10px;
 }

diff --git a/view/theme/frio/templates/album_edit.tpl b/view/theme/frio/templates/album_edit.tpl
new file mode 100644 (file)
index 0000000..583eb6d
--- /dev/null
+++ b/view/theme/frio/templates/album_edit.tpl
@@ -0,0 +1,14 @@
+<div id="photo-album-edit-wrapper">
+<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
+       <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
+       <div class="pull-left photo-album-edit-name">
+       <input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name" style="width: 100%;">
+       </div>
+       
+       <div class="pull-right">
+       <input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+       <input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
+       </div>
+</form>
+</div>
+<div class="clear"></div>