Merge remote-tracking branch 'upstream/master'

9 files changed, 151 insertions, 58 deletions

diff --git a/view/css/mod_thing.css b/view/css/mod_thing.css
new file mode 100644
index 000000000..2a2ba7c92
--- /dev/null
+++ b/view/css/mod_thing.css
@@ -0,0 +1,27 @@
+
+
+.thing-profile #contact-profile-selector {
+	margin-left: 0;
+}
+
+.thing-verb-label {
+	margin-top: 15px;
+}
+
+.thing-verb {
+	margin-bottom: 15px;
+}
+
+.thing-label {
+	float: left;
+	width: 250px;
+}
+
+.thing-input {
+	float: left;
+	margin-bottom: 15px;
+}
+
+.thing-field-end {
+	clear: both;
+}
\ No newline at end of file
diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css
index eeb822f72..277ea5596 100644
--- a/view/theme/redbasic/css/fancy.css
+++ b/view/theme/redbasic/css/fancy.css
@@ -1,7 +1,7 @@
 /* There's probably some stuff in here we don't need, and maybe some missing stuff we do need.  We can clean it up incrementaly, just get the heavy lifting done for now */
 
 aside {
-border-radius: 0px 0px 20px 0px;}
+border-radius: $radiuspx;}
 
 
 .tab {
@@ -9,9 +9,9 @@ border-radius: 0px 0px 20px 0px;}
     background-color: #f00;
     color: #fff !important;
     font-weight: bold;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 20px;
+    -webkit-border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
+    border-radius: $radiuspx;
     margin: 0;
     width: auto;
     margin-left: 8px;
@@ -38,7 +38,7 @@ border-radius: 0px 0px 20px 0px;}
 
 .wall-item-content-wrapper {
 	position: relative;
-	border-radius: 10px;
+	border-radius: $radiuspx;
 	box-shadow: 8px 8px 8px #000;
 	border: 1px solid #eec;
 }
@@ -68,7 +68,7 @@ opacity: 1;
 ul.menu-popup {
   background: #dd0000;
   color: #eec;
-  border-radius: 0px 0px 20px 20px;
+  border-radius: $radiuspx;
   z-index: 100000;
   -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b1509c34f..762c35a18 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -115,8 +115,8 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
 
 input {
 	border: 1px solid #666666;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;	
 	padding: 3px;
 }
 
@@ -209,8 +209,8 @@ nav #site-location {
 	border: 1px solid #444;
 	background-color: #ccc;
 	padding: 10px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;	
 
 }
 
@@ -268,8 +268,8 @@ header #banner #logo-text {
 	border-bottom: 0px;
 	background-color: #aec0d3;
 	color: #565854;		
-	-moz-border-radius: 5px 5px 0px 0px;
-	border-radius: 5px 5px 0px 0px;	
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;;	
 }
 
 nav .nav-link {
@@ -398,7 +398,7 @@ footer {
 	margin-bottom: 5px;
 	font-weight: bold;
 	border: solid 1px #ffffff;
-	border-radius: 5px;
+	border-radius: $radiuspx;
 }
 
 #jot-title::-webkit-input-placeholder{font-weight: bold;}
@@ -926,6 +926,9 @@ footer {
 .wall-item-content-wrapper {
 	margin-top: 10px;
 	position: relative;
+	border-radius: $radiuspx;
+	border: 1px solid #eec;
+
 /*	background: #fff; */
 /*	border-radius: 5px; */
 /*	box-shadow: 12px 12px 12px #111; */
@@ -1175,7 +1178,7 @@ footer {
 	padding: 3px 1px 1px 3px;
 	border: 1px solid #ccc;
 	padding: 8px;
-	border-radius: 5px 5px 5px 5px;
+	border-radius: $radiuspx;
 /*	box-shadow: 5px 5px 5px #666 inset; */
 }
 
@@ -1276,7 +1279,7 @@ footer {
 	height: auto;
 	width: auto;
 	background-color: #0080FF;
-	border-radius: 5px;
+	border-radius: $radiuspx;
 	border: 2px outset;
 	box-shadow: 5px 5px 5px #666;
 	margin-right: 8px;
@@ -1654,8 +1657,8 @@ border: 1px #111;
 
 /*
 #profile-jot-text_parent, .mceLayout {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
     box-shadow: 4px 4px 3px 0 #444444;
 }
 */
@@ -1678,8 +1681,8 @@ tr.mceLast {
 	padding: 8px;
 	margin-right: 0px;
 	width: 90%; 
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;	
 /*	box-shadow: 4px 4px 3px 0 #666 inset; */
 }
 #profile-jot-text:hover {
@@ -1687,16 +1690,16 @@ tr.mceLast {
 }
 
 .wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
     box-shadow: 4px 4px 3px 0 #444444;
 }
 
 
 #datebrowse-sidebar select {
     margin-left: 25px;
-    border-radius: 5px;
-    -moz-border-radius: 5px;
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
     opacity: 0.3;
     filter:alpha(opacity=30);
 }
@@ -1731,8 +1734,8 @@ tr.mceLast {
 }
 
 .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
     box-shadow: 4px 4px 3px 0 #444444;
 }
 
@@ -1741,9 +1744,9 @@ tr.mceLast {
     background-color: #0080FF;
     color: #eeeeec;
     font-weight: bold;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
+    -webkit-border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
+    border-radius: $radiuspx;
     border: 2px outset #222420 !important;
     margin: 0;
     float: right;
@@ -1757,8 +1760,8 @@ tr.mceLast {
 }
 
 .settings-widget .selected {
-    border-radius: 5px;
-    -moz-border-radius: 5px;
+    border-radius: $radiuspx;
+    -moz-border-radius: $radiuspx;
     box-shadow: 4px 4px 3px 0 #444444;
 }
 
@@ -2265,9 +2268,9 @@ aside input[type='text'] {
 	border-bottom: 1px solid #eec;
 	padding: 8px;
 	margin-top: 5px;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 
 }
 
@@ -2435,7 +2438,7 @@ aside input[type='text'] {
 }
 
 #nav-user-linkmenu img {
-	border-radius: 5px;
+	border-radius: $radiuspx;
 	margin-top: -4px;
 }
 
@@ -2824,7 +2827,7 @@ aside input[type='text'] {
 	filter:alpha(opacity=100) !important;
 }
 
-.posttags {
+.posttags, .body-tag {
 	margin-top: 15px;
 }
 
@@ -3464,9 +3467,9 @@ nav .nav-menu-icon {
   height: 22px;
   padding: 5px;
 /*  margin: 3px 10px; */
-  -moz-border-radius: 5px 5px 0 0;
-  -webkit-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
+  -moz-border-radius: $radiuspx;
+  -webkit-border-radius: $radiuspx;
+  border-radius: $radiuspx;
 }
 nav .nav-menu-icon.selected {
   background-color: #FF0000;
@@ -3498,9 +3501,9 @@ nav .nav-menu.selected a {
 nav .nav-notify {
   background-color: #0080FF;
   color: #fff;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
+  -moz-border-radius: $radiuspx;
+  -webkit-border-radius: $radiuspx;
+  border-radius: $radiuspx;
   opacity: 0.6;
   filter:alpha(opacity=60);
 
@@ -3643,9 +3646,9 @@ ul.menu-popup {
 	max-height: 400px;
 	overflow-y: scroll;overflow-style:scrollbar;
 	background-color:#FFFFFF;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius:5px;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 	border: 1px solid #888;
 }
 #nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
@@ -3711,9 +3714,9 @@ ul.menu-popup {
 	background-position: 7px 7px;
 	background-repeat: no-repeat;
 	padding: 7px 5px 0px 30px;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
+	-webkit-border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 	color: #999999;
 }
 #acl-showall.selected {
@@ -3881,3 +3884,13 @@ width: 200px;
 .tag10 {
     font-size : 2.8em !important;
   }
+
+.profile-thing-list {
+	list-style-type: none;
+}
+/*
+.profile-thing-list li {
+	float: left;
+	margin-right: 25px;
+}
+*/
\ No newline at end of file
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 9b1cf1fbd..5917b1e36 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -16,7 +16,9 @@ function theme_content(&$a) {
 	$iconset = get_pconfig(local_user(), 'redbasic', 'iconset');
 	$shiny = get_pconfig(local_user(), 'redbasic', 'shiny');
 	$colour_scheme = get_pconfig(local_user(), 'redbasic', 'colour_scheme');
-	return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme);
+	$radius = get_pconfig(local_user(),'redbasic','radius');
+
+	return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius);
 }
 
 function theme_post(&$a) {
@@ -33,6 +35,7 @@ function theme_post(&$a) {
 		set_pconfig(local_user(), 'redbasic', 'iconset', $_POST['redbasic_iconset']);
 		set_pconfig(local_user(), 'redbasic', 'shiny', $_POST['redbasic_shiny']);
 		set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']);
+		set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']);
 	}
 }
 
@@ -67,7 +70,7 @@ function theme_post(&$a) {
 //}
 
 // These aren't all used yet, but they're not bloat - we'll use drop down menus in idiot mode.
-function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme) {
+function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius) {
 	$line_heights = array(
 		"1.3" => "1.3",
 		"---" => "---",
@@ -141,6 +144,7 @@ function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolo
 		'$linkcolour' => array('redbasic_linkcolour', t('Display colour of links - hex value, do not include the #'), $linkcolour, '', $linkcolours),
 		'$iconset' => array('redbasic_iconset', t('Icons'), $iconset, '', $iconsets),
 		'$shiny' => array('redbasic_shiny', t('Shiny style'), $shiny, '', $shinys),
+		'$radius' => array('redbasic_radius', t('Corner radius'), $radius, t('0-99 default: 5')),
 	  ));}
 	 
 	 if(! feature_enabled(local_user(),'expert')) {
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 31b83394f..aa88443bc 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -17,6 +17,7 @@
     $displaystyle = false;
     $linkcolour = false;
     $shiny = false;
+	$radius = 5;
     $site_line_height = get_config("redbasic","line_height");
     $site_redbasic_font_size = get_config("redbasic", "font_size" );
     $site_colour = get_config("redbasic", "colour" );
@@ -25,6 +26,10 @@
     $displaystyle = get_config("redbasic", "displaystyle" );
     $linkcolour = get_config("redbasic", "linkcolour" );
     $shiny = get_config("redbasic", "shiny" );
+
+	$x = get_config('redbasic','radius');
+	if($x !== false)
+		$radius = $x;
     
     if (local_user()) {
         $line_height = get_pconfig(local_user(), "redbasic","line_height");
@@ -35,6 +40,10 @@
         $displaystyle = get_pconfig(local_user(), "redbasic", "displaystyle");
         $linkcolour = get_pconfig(local_user(), "redbasic", "linkcolour");
         $shiny = get_pconfig(local_user(), "redbasic", "shiny");
+		$x = get_pconfig(local_user(),'redbasic','radius');
+		if($x !== false)
+			$radius = $x;
+
         if (! feature_enabled(local_user(),'expert')) {$colour_scheme = get_pconfig(local_user(), "redbasic", "colour_scheme");}
     }
 
@@ -45,6 +54,8 @@
 	    // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else
 	    if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';}
 	    if ($colour_scheme === 'redbasic'){$navcolour = 'red';}
+		$shadows = false;
+		$radius = 5;
 }
 
 // This is probably the easiest place to apply global settings.  Don't bother with site line height and such.  Instead, check pconfig for global user settings.  
@@ -70,7 +81,7 @@
 			$x = str_replace("\n","",$x);
 			logger('pcss compress: final size: ' . strlen($x), LOGGER_DEBUG);
 		}
-		echo $x;
+		echo str_replace(array('$radius'),array($radius),$x);
     }
     echo "\r\n";
 
@@ -124,7 +135,8 @@
 	if ($displaystyle === "fancy") 
 	      {if (file_exists('view/theme/' . current_theme() . '/css/fancy.css')) {
 		  $fancy = (file_get_contents('view/theme/' . current_theme() . '/css/fancy.css'));
-	      echo "$fancy";}
+			echo str_replace(array('$radius'),array($radius),$fancy);
+	      }
 	  }
     
 // Put the # here to force hex colours - if we don't, somebody is going to do something odd, using RGB and we're all going to be confused on the support forums
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index f8d9f223c..cd980fbc3 100755
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,8 +1,3 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
 {{include file="field_select.tpl" field=$colour}}
 
 {{include file="field_input.tpl" field=$font_size}}
@@ -21,6 +16,8 @@
 
 {{include file="field_select.tpl" field=$shiny}}
 
+{{include file="field_input.tpl" field=$radius}}
+
 <div class="settings-submit-wrapper">
 	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 78e911213..99c2c7868 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -17,7 +17,7 @@
 
 {{$head_js}}
 
-<link rel="shortcut icon" href="{{$baseurl}}/images/rhash-32.png" />
+<link rel="shortcut icon" href="{{$icon}}" />
 <link rel="search"
          href="{{$baseurl}}/opensearch" 
          type="application/opensearchdescription+xml" 
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index f8743c011..0d1750085 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -170,6 +170,18 @@
 </dl>
 {{/if}}
 
-
+{{if $things}}
+{{foreach $things as $key => $items}}
+<b>{{$profile.fullname.1}} {{$key}}</b>
+<ul class="profile-thing-list">
+{{foreach $items as $item}}
+<li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}}
+<a href="{{$item.url}}" >{{$item.term}}</a>
+</li>
+{{/foreach}}
+</ul>
+<div class="clear"></div>
+{{/foreach}}
+{{/if}}
 
 
diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl
new file mode 100644
index 000000000..06cbfe917
--- /dev/null
+++ b/view/tpl/thing_input.tpl
@@ -0,0 +1,28 @@
+<h2>{{$thing_hdr}}</h2>
+<form action="thing" method="post" >
+
+{{if $multiprof }}
+<div class="thing-profile-label">{{$profile_lbl}}</div>
+
+<div class="thing-profile">{{$profile_select}}</div>
+{{/if}}
+
+<div class="thing-verb-label">{{$verb_lbl}}</div>
+
+<div class="thing-verb">{{$verb_select}}</div>
+
+
+<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
+<input type="text" class="thing-input" id="thing-term" name="term" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
+<input type="text" class="thing-input" id="thing-url" name="url" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
+<input type="text" class="thing-input" id="thing-img" name="img" />
+<div class="thing-field-end"></div>
+
+<div class="thing-end"></div> 
+
+<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
+</form>