From d8c03526ed24a4b26c589659d394848c81bacc53 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 25 Sep 2014 20:21:23 -0700
Subject: optionally include wall items (posts) in import/export

---
 view/tpl/channel_import.tpl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index f7635ea52..f76594934 100755
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
@@ -22,6 +22,11 @@
 	<input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" />
 	<div id="import-old-pass-end" class="import-field-end"></div>
 
+	<input type="checkbox" name="import_posts" id="import-posts" value="1" />
+	<label for="import-posts" id="label-import-posts">{{$label_import_posts}}</label>
+	<div id="import-posts-end" class="import-field-end"></div>
+
+
 	<div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div>
 
 	<input type="checkbox" name="make_primary" id="import-make-primary" value="1" />
-- 
cgit v1.2.3


From 1e7fbac6c1a26e6ae5be18ce3e5332f222bc2977 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 26 Sep 2014 01:52:30 -0700
Subject: doc updates, clean up buttons on PM edit template to match other edit
 buttons

---
 view/tpl/mail_list.tpl   |  2 +-
 view/tpl/prv_message.tpl | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index e17a206a0..6b06f6127 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -3,6 +3,6 @@
 	<span class="mail-list">{{$from_name}}</span>
 	<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
-	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
+	<span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<div class="clear">&nbsp;</div>
 </div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 118bd846f..709943541 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -26,26 +26,26 @@
 
 <div id="prvmail-submit-wrapper" >
 	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
+	<button id="prvmail-upload-wrapper" class="btn btn-default btn-sm" >
 		<i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i>
-	</div> 
+	</button> 
 
-	<div id="prvmail-attach-wrapper" >
+	<button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" >
 		<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
-	</div> 
+	</button> 
 
-	<div id="prvmail-link-wrapper" >
+	<button id="prvmail-link-wrapper" class="btn btn-default btn-sm" >
 		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
-	</div> 
+	</button> 
 	{{if $feature_expire}}
-	<div id="prvmail-expire-wrapper" >
+	<button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" >
 		<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
-	</div>
+	</button>
 	{{/if}}
 	{{if $feature_encrypt}}
-	<div id="prvmail-encrypt-wrapper" >
+	<button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" >
 		<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i>
-	</div> 
+	</button> 
 	{{/if}}
 	<div id="prvmail-rotator-wrapper" >
 		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-- 
cgit v1.2.3


From b948ab595592e4a43f684a49dc681a755f8c8673 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 26 Sep 2014 12:29:07 +0200
Subject: some more work on photos - work in progress

---
 view/tpl/photo_albums.tpl  | 27 ++++++++++++++-------------
 view/tpl/photos_recent.tpl | 16 +++++++---------
 2 files changed, 21 insertions(+), 22 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 7ff4a8cc0..27f156c68 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,15 +1,16 @@
 <div id="side-bar-photos-albums" class="widget">
-<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
-{{if $albums}}
-<ul>
-{{foreach $albums as $al}}
-{{if $al.text}}
-<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li>
-{{/if}}
-{{/foreach}}
-</ul>
-{{/if}}
-{{if $upload}}
-<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div>
-{{/if}}
+	<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
+	{{if $albums}}
+	<ul class="nav nav-pills nav-stacked">
+		{{foreach $albums as $al}}
+		{{if $al.text}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li>
+		{{/if}}
+		{{/foreach}}
+
+	{{/if}}
+	{{if $upload}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
+	{{/if}}
+	</ul>
 </div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index fce518cfe..b4094512c 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,13 +1,11 @@
-<h3>{{$title}}</h3>
-{{if $can_post}}
-<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
-{{/if}}
-
+<div class="section-title-wrapper">
+	<h3>{{$title}}</h3>
+</div>
 <div id="photo-album-contents">
-{{foreach $photos as $photo}}
-	{{include file="photo_top.tpl"}}
-{{/foreach}}
-<div id="page-end"></div>
+	{{foreach $photos as $photo}}
+		{{include file="photo_top.tpl"}}
+	{{/foreach}}
+	<div id="page-end"></div>
 </div>
 <div class="photos-end"></div>
 <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
-- 
cgit v1.2.3