Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 33 insertions, 38 deletions

diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index adf2e632d..8a4fc666e 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,50 +1,45 @@
 {{include file="field_select.tpl" field=$schema}}
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
-
 {{if $expert}}
-
-{{include file="field_checkbox.tpl" field=$narrow_navbar}}
-{{include file="field_colorinput.tpl" field=$nav_bg}}
-{{include file="field_colorinput.tpl" field=$nav_gradient_top}}
-{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
-{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
-{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
-{{include file="field_colorinput.tpl" field=$nav_bd}}
-{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
-{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
-{{include file="field_colorinput.tpl" field=$banner_colour}}
-{{include file="field_colorinput.tpl" field=$link_colour}}
-{{include file="field_colorinput.tpl" field=$bgcolour}}
-{{include file="field_colorinput.tpl" field=$background_image}}
-{{include file="field_colorinput.tpl" field=$item_colour}}
-{{include file="field_colorinput.tpl" field=$comment_item_colour}}
-{{include file="field_colorinput.tpl" field=$comment_border_colour}}
-{{include file="field_input.tpl" field=$comment_indent}}
-{{include file="field_colorinput.tpl" field=$toolicon_colour}}
-{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
-{{include file="field_input.tpl" field=$body_font_size}}
-{{include file="field_input.tpl" field=$font_size}}
-{{include file="field_colorinput.tpl" field=$font_colour}}
-{{include file="field_input.tpl" field=$radius}}
-{{include file="field_input.tpl" field=$shadow}}
+	{{include file="field_colorinput.tpl" field=$nav_bg}}
+	{{include file="field_colorinput.tpl" field=$nav_gradient_top}}
+	{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
+	{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
+	{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
+	{{include file="field_colorinput.tpl" field=$nav_bd}}
+	{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
+	{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
+	{{include file="field_input.tpl" field=$nav_min_opacity}}
+	{{include file="field_colorinput.tpl" field=$bgcolour}}
+	{{include file="field_colorinput.tpl" field=$background_image}}
+	{{include file="field_colorinput.tpl" field=$item_colour}}
+	{{include file="field_colorinput.tpl" field=$comment_item_colour}}
+	{{include file="field_colorinput.tpl" field=$comment_border_colour}}
+	{{include file="field_input.tpl" field=$comment_indent}}
+	{{include file="field_input.tpl" field=$body_font_size}}
+	{{include file="field_input.tpl" field=$font_size}}
+	{{include file="field_colorinput.tpl" field=$font_colour}}
+	{{include file="field_colorinput.tpl" field=$link_colour}}
+	{{include file="field_colorinput.tpl" field=$banner_colour}}
+	{{include file="field_colorinput.tpl" field=$toolicon_colour}}
+	{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
+	{{include file="field_input.tpl" field=$radius}}
+	{{include file="field_input.tpl" field=$shadow}}
+	{{include file="field_input.tpl" field=$top_photo}}
+	{{include file="field_input.tpl" field=$reply_photo}}
+{{/if}}
 {{include file="field_input.tpl" field=$converse_width}}
 {{include file="field_checkbox.tpl" field=$converse_center}}
-{{include file="field_input.tpl" field=$nav_min_opacity}}
-{{include file="field_input.tpl" field=$top_photo}}
-{{include file="field_input.tpl" field=$reply_photo}}
-{{*include file="field_checkbox.tpl" field=$sloppy_photos*}}
+{{include file="field_checkbox.tpl" field=$narrow_navbar}}
+{{if $expert}}
 <script>
 	$(function(){
-		$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker();
+		$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'});
 		$('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
 		$('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
 		$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
 	});
 </script>
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
 {{/if}}
+<div class="settings-submit-wrapper" >
+	<button type="submit" name="redbasic-settings-submit" class="btn btn-primary">{{$submit}}</button>
+</div>