Merge remote-tracking branch 'upstream/master'

5 files changed, 110 insertions, 59 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 38eea5b94..b1509c34f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3833,3 +3833,51 @@ span.mail-date {
 float:left;
 width: 200px;
 }
+
+
+.tag1 {
+    font-size : 1.0em !important;
+  }
+.tag2 {
+    font-size : 1.2em !important;
+  }
+
+
+.tag3 {
+    font-size : 1.4em !important;
+  }
+
+
+.tag4 {
+    font-size : 1.6em !important;
+  }
+
+
+.tag5 {
+    font-size : 1.8em !important;
+  }
+
+
+.tag6 {
+    font-size : 2.0em !important;
+  }
+
+
+.tag7 {
+    font-size : 2.2em !important;
+  }
+
+
+.tag8 {
+    font-size : 2.4em !important;
+  }
+
+
+.tag9 {
+    font-size : 2.6em !important;
+  }
+
+
+.tag10 {
+    font-size : 2.8em !important;
+  }
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 442692b3d..c373976ab 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -75,6 +75,15 @@
 
 </div>
 
+{{if $multiprofs }}
+<div>
+<h3>{{$lbl_vis1}}</h3>
+<div>{{$lbl_vis2}}</div>
+
+{{$profile_select}}
+</div>
+{{/if}}
+
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
 </form>
diff --git a/view/tpl/photo_edit.tpl b/view/tpl/photo_edit.tpl
deleted file mode 100755
index fefe7f10b..000000000
--- a/view/tpl/photo_edit.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="{{$item_id}}" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
-	<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$caption}}" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
-	<input name="newtag" id="photo-edit-newtag" size="84" title="{{$help_tags}}" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div id="photo-edit-rotate-label">
-			{{$rotatecw}}<br>
-			{{$rotateccw}}
-		</div>
-		<input type="radio" name="rotate" value="1" /><br>
-		<input type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}"/>
-			<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				{{$aclselect}}
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index fe090409a..fce6f6fa8 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -14,8 +14,6 @@
 
 <div id="photo-edit-link-wrap">
 {{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
 <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
 {{/if}}
 {{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
@@ -32,7 +30,58 @@
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}
+<div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div>
+<div id="photo-edit-edit" style="display: none;">
+<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="{{$item_id}}" />
+
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
+	<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div id="photo-edit-rotate-label">
+			{{$edit.rotatecw}}<br>
+			{{$edit.rotateccw}}
+		</div>
+		<input type="radio" name="rotate" value="1" /><br>
+		<input type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$edit.permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$edit.lockstate}}" ></span>{{$edit.permissions}}
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				{{$edit.aclselect}}
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+</div>
+{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 864599244..33cc9b75b 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -10,7 +10,7 @@
 <div id="profile-edit-links">
 <ul>
 <li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li>
-<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
 <li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
 <li></li>
 <li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>