Merge remote branch 'upstream/master'

8 files changed, 48 insertions, 24 deletions

diff --git a/view/group_selection.tpl b/view/group_selection.tpl
new file mode 100644
index 000000000..3809cb994
--- /dev/null
+++ b/view/group_selection.tpl
@@ -0,0 +1,8 @@
+<div class="field custom">
+<label for="group-selection" id="group-selection-lbl">$label</label>
+<select name="group-selection" id="group-selection" >
+{{ for $groups as $group }}
+<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option>
+{{ endfor }}
+</select>
+</div>
diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
index d9f873ea0..924fc47ac 100644
--- a/view/pagetypes.tpl
+++ b/view/pagetypes.tpl
@@ -2,3 +2,6 @@
 	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
 	{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
 	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
+	{{ if $experimental }}
+	{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
+	{{ endif }}
\ No newline at end of file
diff --git a/view/settings.tpl b/view/settings.tpl
index cec3c6f64..556cd3ba3 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -56,9 +56,12 @@ $suggestme
 
 $unkmail
 
+
 {{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
 
 {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
 <div class="field input">
 	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
 	<div style="display: none;">
@@ -90,6 +93,8 @@ $unkmail
 <br/>
 <div id="settings-default-perms-end"></div>
 
+$group_select
+
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Submit" />
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 60e7db6e1..3bb30be83 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -55,9 +55,9 @@ h6{font-size:xx-small;}
 .action{margin:5px 0;}
 .tool{margin:5px 0;list-style:none;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeecc;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#eeeecc;font-size:smaller;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
+.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
 .intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -395,7 +395,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #sidebar-group-ul{padding-left:0;}
 #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
 #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
-.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#2e2f2e;background:#2e3436;border:1px solid #638ec4;padding:3px;}
+.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#eeeecc;background:#2e3436;border:1px solid #638ec4;padding:3px;}
 #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
 #peoplefind-sidebar form{margin-bottom:10px;}
 #sidebar-new-group:hover{}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 7634db1d7..4967ac9c2 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -282,27 +282,27 @@ h6 {
 }
 .button,
 #profile-listing-desc {
-	.box(25%, auto);
-	background: @menu_bg_colour;
+	// .box(25%, auto);
+	// background: @menu_bg_colour;
 	color: @main_colour;
-	.borders(2px, outset, darken(@menu_bg_colour, 20%));
-	.rounded_corners;
+	// .borders(2px, outset, darken(@menu_bg_colour, 20%));
+	// .rounded_corners;
 	padding: 5px;
-	font-size: smaller;
+	// font-size: smaller;
 	cursor: pointer;
 	&.active {
 		.box_shadow(4px, 4px, 7px);
 	}
 	a {
 		color: @main_colour;
-		font-size: smaller;
+		// font-size: smaller;
 		font-weight: bold;
 	}
 }
 [class$="-desc"],
 [id$="-desc"] {
-	color: @bg_colour;
-	// background: @main_colour;
+	color: @main_colour;
+	background: @bg_colour;
 	.borders(1px, outset, @main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
@@ -568,6 +568,9 @@ div.jGrowl div {
 		padding-left: 58px;
 		margin-top: 50px;
 	}
+	// &.jGrowl-message {
+
+	// }
 }
 #nav-notifications-menu {
 	margin: 30px 0 0 -20px;
@@ -2349,7 +2352,7 @@ div {
 .sidebar-group-element {
 	padding: 3px;
 	&:hover {
-		color: @bg_colour;
+		color: @main_colour;
 		background: @shiny_colour;
 		.borders(1px, solid, @hover_colour);
 		padding: 3px;
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index e89ee7d24..1099f0913 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -55,9 +55,9 @@ h6{font-size:xx-small;}
 .action{margin:5px 0;}
 .tool{margin:5px 0;list-style:none;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeeec;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
-.button a,#profile-listing-desc a{color:#eeeeec;font-size:smaller;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeeec;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
+.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
+[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
 .intro-desc{margin-bottom:20px;font-weight:bold;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 51ffbd1f2..4e1b85031 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -283,27 +283,27 @@ h6 {
 }
 .button,
 #profile-listing-desc {
-	.box(25%, auto);
-	background: @menu_bg_colour;
-	color: @bg_colour;
-	.borders(2px, outset, darken(@menu_bg_colour, 20%));
-	.rounded_corners;
+	// .box(25%, auto);
+	// background: @menu_bg_colour;
+	color: @main_colour;
+	// .borders(2px, outset, darken(@menu_bg_colour, 20%));
+	// .rounded_corners;
 	padding: 5px;
-	font-size: smaller;
+	// font-size: smaller;
 	cursor: pointer;
 	&.active {
 		.box_shadow(4px, 4px, 7px);
 	}
 	a {
 		color: @bg_colour;
-		font-size: smaller;
+		// font-size: smaller;
 		font-weight: bold;
 	}
 }
 [class$="-desc"],
 [id$="-desc"] {
 	color: @bg_colour;
-	// background: @main_colour;
+	background: @main_colour;
 	.borders(1px, outset, @bg_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b978c13e5..826acc7ef 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1091,6 +1091,11 @@ input#dfrn-url {
 	overflow: auto;
 }
 
+.wall-item-content img {
+  max-width: 700px;
+}
+
+
 .wall-item-title {
 	float: left;
 	font-weight: bold;