Merge branch 'pocorate'

5 files changed, 67 insertions, 0 deletions

diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index 98c53602b..44a0a1abf 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -52,6 +52,15 @@
 	width: 600px !important;
 }
 
+#rating-slider {
+	width: 600px !important;
+}
+
+#rating-text {
+	width: 400px;
+	height: 60px;
+}
+
 .abook-edit-them, .abook-edit-me {
 	float: left;
 	margin-left: 10px;
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 03b7e2440..7c75bfac4 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -43,6 +43,15 @@
 {{$slide}}
 
 {{/if}}
+
+{{if $rating}}
+<h3>{{$lbl_rating}}</h3>
+
+{{$rating}}
+
+
+{{/if}}
+
 {{/if}}
 
 
@@ -57,6 +66,7 @@
 
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
+<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
 
 
 
@@ -66,6 +76,13 @@
 </div>
 {{/if}}
 
+{{if $rating}}
+{{if $notself}}
+<h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3>
+<textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea>
+{{/if}}
+{{/if}}
+
 {{if $multiprofs }}
 <div>
 <h3>{{$lbl_vis1}}</h3>
diff --git a/view/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
index 869894852..30b6268dc 100755
--- a/view/tpl/poco_entry_xml.tpl
+++ b/view/tpl/poco_entry_xml.tpl
@@ -2,6 +2,7 @@
 {{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
 {{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
 {{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
+{{if $entry.rating}}<rating>{{$entry.rating}}</rating>{{/if}}
 {{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
 {{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
 </entry>
diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl
new file mode 100644
index 000000000..d0c1e5ec6
--- /dev/null
+++ b/view/tpl/prep.tpl
@@ -0,0 +1,36 @@
+<h1>{{$header}}</h1>
+
+{{if $poi}}
+
+<div class="directory-item lframe" id="directory-item-{{$poi.xchan_hash}}" >
+
+<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$poi.xchan_hash}}" >
+<div class="contact-photo" id="directory-photo-{{$poi.xchan_hash}}" >
+<a href="{{$poi.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$poi.xchan_hash}}" ><img class="directory-photo-img" src="{{$poi.xchan_photo_l}}" alt="{{$poi.xchan_addr}}" title="{{$poi.xchan_addr}}" /></a>
+<div class="contact-name">{{$poi.xchan_name}}</div>
+</div>
+</div>
+{{/if}}
+
+{{if $raters}}
+{{foreach $raters as $r}}
+
+<div class="directory-item lframe" id="directory-item-{{$r.xchan_hash}}" >
+
+<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$r.xchan_hash}}" >
+<div class="contact-photo" id="directory-photo-{{$r.xchan_hash}}" >
+<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><img class="directory-photo-img" src="{{$r.xchan_photo_l}}" alt="{{$r.xchan_addr}}" title="{{$r.xchan_addr}}" /></a>
+<div class="contact-name">{{$r.xchan_name}}</div>
+</div>
+Rating: {{$r.xlink_rating}}
+{{if $r.xlink_rating_text}}
+Reason: {{$r.xlink_rating_text}}
+{{/if}}
+</div>
+{{/foreach}}
+{{/if}}
+
+
+
+
+
diff --git a/view/tpl/rating_slider.tpl b/view/tpl/rating_slider.tpl
new file mode 100644
index 000000000..4702fc65b
--- /dev/null
+++ b/view/tpl/rating_slider.tpl
@@ -0,0 +1,4 @@
+<div id="rating-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div>
+<script>
+	$("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'100%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); }  });
+</script>