form cleanup (profile_photo and cover_photo), admin 'user_approve' not found, missing close div in mood_content.tpl

3 files changed, 79 insertions, 59 deletions

diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 1db139e7b..4352501ae 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -1,23 +1,29 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
+<div id="profile-photo-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
 
-<form enctype="multipart/form-data" action="cover_photo" method="post">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<form enctype="multipart/form-data" action="cover_photo" method="post">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-<div id="profile-photo-upload-wrapper">
+		<div id="profile-photo-upload-wrapper">
 
-<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
-<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
-<div class="clear"></div>
+			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
+			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+			<div class="clear"></div>
+			<br />
+			<br />
+			<div id="profile-photo-submit-wrapper">
+				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+			</div>
+		</div>
 
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-</div>
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-{{$select}}
-</div>
+		</form>
+		<br />
+		<br />
+		<div id="profile-photo-link-select-wrapper">
+			{{$select}}
+		</div>
+	</div>
 </div>
diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
index 4059620ce..315ee4c8a 100755
--- a/view/tpl/mood_content.tpl
+++ b/view/tpl/mood_content.tpl
@@ -5,27 +5,29 @@
     </div>
     <div class="section-content-wrapper">
 
-    <div id="mood-desc">{{$desc}}</div>
+	    <div id="mood-desc">{{$desc}}</div>
 
-<br />
-<br />
+		<br />
+		<br />
 
 
-<form action="mood" method="get">
-<br />
-<br />
+		<form action="mood" method="get">
+		<br />
+		<br />
 
-<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" />
+		<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" />
 
-<div class="form-group field custom">
-	<select name="verb" id="mood-verb-select" class="form-control" >
-	{{foreach $verbs as $v}}
-		<option value="{{$v.0}}">{{$v.1}}</option>
-	{{/foreach}}
-	</select>
-</div>
-<br />
-<br />
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
+		<div class="form-group field custom">
+			<select name="verb" id="mood-verb-select" class="form-control" >
+			{{foreach $verbs as $v}}
+				<option value="{{$v.0}}">{{$v.1}}</option>
+			{{/foreach}}
+			</select>
+		</div>
+		<br />
+		<br />
 
+		<input type="submit" name="submit" value="{{$submit}}" />
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index fbed32606..88e17407b 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -1,31 +1,43 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$title}}</h1>
+<div id="profile-photo-content" class="generic-content-wrapper">
+    <div class="section-title-wrapper">
+    <h2>{{$title}}</h2>
+    </div>
+    <div class="section-content-wrapper">
 
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<form enctype="multipart/form-data" action="profile_photo" method="post">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-<div id="profile-photo-upload-wrapper">
+		<div id="profile-photo-upload-wrapper">
 
-<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
-<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
-<div class="clear"></div>
+			<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
+			<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+			<div class="clear"></div>
 
-<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
-<select name="profile" id="profile-photo-profiles" class="form-input" >
-{{foreach $profiles as $p}}
-<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
-{{/foreach}}
-</select>
-<div class="clear"></div>
+			{{if $single}}
+			<input type="hidden" name="profile" value="{{$profile0.id}}" />
+			{{else}}
 
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-</div>
-</div>
+			<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
+			<select name="profile" id="profile-photo-profiles" class="form-control" >
+			{{foreach $profiles as $p}}
+				<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
+			{{/foreach}}
+			</select>
+			<div class="clear"></div>
+			<br />
+			<br />
+			{{/if}}
 
-</form>
+			<div id="profile-photo-submit-wrapper">
+				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+			</div>
+		</div>
 
-<div id="profile-photo-link-select-wrapper">
-{{$select}}
-</div>
+		</form>
+		<br />
+		<br />
+		<div id="profile-photo-link-select-wrapper">
+		{{$select}}
+		</div>
+	</div>
 </div>