Rebase from upstream

11 files changed, 88 insertions, 96 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index a382a42b3..0c004ee05 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,37 +1,15 @@
 /* override some bootstrap settings */
 
-html {
-	font-size: 100%;
+h1, h2 {
+   font-size: 1.583em;
 }
 
-h1,
-.h1 {
-  font-size: 24px;
+h3, h4 {
+   font-size: 1.334em;
 }
 
-h2,
-.h2 {
-  font-size: 18px;
-}
-
-h3,
-.h3 {
-  font-size: 16px;
-}
-
-h4,
-.h4 {
-  font-size: 14px;
-}
-
-h5,
-.h5 {
-  font-size: 12px;
-}
-
-h6,
-.h6 {
-  font-size: 10px;
+h5, h6 {
+   font-size: 0.75rem;
 }
 
 /* nav overrides */
@@ -96,3 +74,8 @@ nav .navbar-collapse .navbar-right {
 code {
 	white-space: normal;
 }
+
+
+blockquote {
+	font-size: 1em;
+}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index c7b381928..80b5de250 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -107,6 +107,18 @@
 	overflow: auto;
 }
 
+.wall-item-content h1,  .wall-item-content h2 {
+   font-size: 1.319em;
+}
+
+.wall-item-title {
+   font-size: $font_size;
+}
+
+.wall-item-title h3, .wall-item-content h3,  .wall-item-content h4 {
+   font-size: 1.112em;
+}
+
 .wall-item-content img {
     max-width: 95%;
 }
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index c278f4d53..011c3edd5 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -45,8 +45,8 @@ img.mail-list-sender-photo {
 #prvmail-rotator-wrapper {
 	float: left;
 	margin-top: 10px;
-	margin-right: 10px;
-	width: 24px;
+/*	margin-right: 10px;
+	width: 24px; */
 	cursor: pointer;
 }
 
diff --git a/view/css/mod_message.css b/view/css/mod_message.css
index 7c45e05be..4290025a5 100644
--- a/view/css/mod_message.css
+++ b/view/css/mod_message.css
@@ -55,8 +55,8 @@ img.mail-list-sender-photo {
 #prvmail-rotator-wrapper {
 	float: left;
 	margin-top: 10px;
-	margin-right: 10px;
-	width: 24px;
+/*	margin-right: 10px;
+	width: 24px; */
 	cursor: pointer;
 }
 
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 8bf5a9e97..96b4c1d60 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -2,6 +2,7 @@
 /* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */
 
 .widget {
+	word-wrap: break-word;
 	margin-bottom: 10px;
 	padding: 10px 10px 10px 20px;
 }
@@ -9,7 +10,6 @@
 .widget h3 {
 	margin-left: -10px;
 	margin-top: 0px;
-	margin-bottom: 10px;
 }
 
 /* suggest */
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4e662f1db..2cb2d917d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -9,6 +9,7 @@
 /* generals */
 html {
 	height: 100%;
+	font-size: 100%;
 }
 
 body {
@@ -2206,10 +2207,6 @@ nav ul li {
 	max-height: 50px
 }
 
-nav .badge {
-	border-radius: $radiuspx;
-}
-
 nav .dropdown-menu {
 	font-size: $body_font_size;
 	border-top-right-radius: 0px;
@@ -2251,32 +2248,8 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 }
 
 /* bootstrap overrides */
-blockquote {
-	font-size: 1em;
-}
-
-h1, h2 {
-   font-size: 1.583em;
-}
-
-h3, h4 {
-   font-size: 1.334em;
-}
-
-h5, h6 {
-   font-size: 0.75rem; 
-}
-
-.wall-item-content h1,  .wall-item-content h2 {
-   font-size: 1.319em;
-}
-
-.wall-item-title {
-   font-size: $font_size;
-}
-
-.wall-item-title h3, .wall-item-content h3,  .wall-item-content h4 {
-   font-size: 1.112em;
+.badge {
+	border-radius: $radiuspx;
 }
 
 .dropdown-menu {
@@ -2448,6 +2421,26 @@ h5, h6 {
 	background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
 }
 
+.section-title-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	border-radius: $radiuspx;
+	margin-bottom: 10px;
+}
+
+.section-title-wrapper h3 {
+	margin-top: 0px;
+	margin-bottom: 0px;
+}
+
+.section-title-submenu {
+	margin-top: 10px;
+}
+
+.section-title-submenu a {
+	margin-right: 10px;
+}
+
 @media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
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" />
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/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>
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;" />