Merge remote-tracking branch 'upstream/master'

3 files changed, 42 insertions, 2 deletions

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>