From f0b900057a63a5c9efb8f35daa05b6c7e79d0adb Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 27 Jan 2015 16:51:13 -0800
Subject: first cut at direntry template, right now just provide a mockup with
 a slider and rating count to look at.

---
 view/tpl/direntry.tpl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'view')

diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index cdc6f1f97..f51fd0908 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -15,6 +15,18 @@
 <div class='contact-info'>
 <div class="contact-name" id="directory-name-{{$entry.id}}"  ><a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</div>
 
+{{*if $entry.rateme*}}
+<div id="dir-rating-wrapper-{{$entry.id}}" style="float:right; width: 20%;">
+62 ratings<br />
+<div id="dir-rating-slider-{{$entry.id}}" class="dir-slider" style="height: 32px; margin-right:10px;">
+<input id="dir-rating-range-{{$entry.id}}" type="text" value="0" name="fake-rating-{{$entry.id}}" style="display: none;">
+</div>
+</div>
+<div class="clear"></div>
+<script>
+$("#dir-rating-range-{{$entry.id}}").jRange({ from: -10, to: 10, step: 1, width:'100%', showLabels: false, showScale: true, scale : [ '-10','-5','0','5','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } });
+</script>
+{{*/if*}}
 {{if $entry.public_forum}}
 <div class="contact-forum">
 {{$entry.forum_label}} @{{$entry.nickname}}+
-- 
cgit v1.2.3


From 06291c6f4274b32dbc3b3e6ef01c80a8775f3094 Mon Sep 17 00:00:00 2001
From: RedSwede <redswede@riseup.net>
Date: Thu, 29 Jan 2015 16:22:14 +0100
Subject: non-tested fix for issue 847

---
 view/tpl/event_form.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index a4717415e..2479068f3 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -41,7 +41,7 @@
 
 {{if $catsenabled}}
 <div id="event-category-wrap">
-	<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" />
+	<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" data-role="tagsinput"  />
 </div>
 {{/if}}
 
-- 
cgit v1.2.3


From 05ce141ecc13d2af754b1e055b1856e73a65d7dd Mon Sep 17 00:00:00 2001
From: RedSwede <redswede@riseup.net>
Date: Thu, 29 Jan 2015 16:30:45 +0100
Subject: small autocomplete fix adding space to the output provides: the
 ability to press enter after pressing enter during the mention-js-popup (this
 second enter should behave as a normal one) FF35

---
 view/js/autocomplete.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 86847cb35..b93cc16b3 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -77,7 +77,7 @@ function editor_replace(item) {
 	// 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id).
 	if(id.length > 16) 
 		id = item.id.substring(0,16);
-	return '$1$2'+item.nick.replace(' ','') + '+' + id;
+	return '$1$2'+item.nick.replace(' ','') + '+' + id + ' ';
 }
 
 function basic_replace(item) {
-- 
cgit v1.2.3


From f81df92ef8edea69f12ed60bdf9b141febbeb534 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Thu, 29 Jan 2015 20:27:35 +0100
Subject: Add allowed and not allowed emails to the UI in the

admin menu
---
 view/tpl/admin_site.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index caeddeecb..a30892f71 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -55,7 +55,8 @@
 	{{include file="field_input.tpl" field=$register_text}}
 	{{include file="field_select.tpl" field=$register_policy}}
 	{{include file="field_select.tpl" field=$access_policy}}
-	
+	{{include file="field_textarea.tpl" field=$allowed_email}}
+	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
 	<h3>{{$upload}}</h3>
-- 
cgit v1.2.3


From 3e22de0be01cc53e74ffd00f5b9d14d4bcc9b6c5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 29 Jan 2015 18:17:24 -0800
Subject: how did that stuff merge? grrrr....

---
 view/tpl/direntry.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index f51fd0908..6ba86a085 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -15,7 +15,7 @@
 <div class='contact-info'>
 <div class="contact-name" id="directory-name-{{$entry.id}}"  ><a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</div>
 
-{{*if $entry.rateme*}}
+{{if $entry.rateme}}
 <div id="dir-rating-wrapper-{{$entry.id}}" style="float:right; width: 20%;">
 62 ratings<br />
 <div id="dir-rating-slider-{{$entry.id}}" class="dir-slider" style="height: 32px; margin-right:10px;">
@@ -26,7 +26,7 @@
 <script>
 $("#dir-rating-range-{{$entry.id}}").jRange({ from: -10, to: 10, step: 1, width:'100%', showLabels: false, showScale: true, scale : [ '-10','-5','0','5','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } });
 </script>
-{{*/if*}}
+{{/if}}
 {{if $entry.public_forum}}
 <div class="contact-forum">
 {{$entry.forum_label}} @{{$entry.nickname}}+
-- 
cgit v1.2.3


From dbd3999117c0a78f0195b620faee82f553164c80 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 30 Jan 2015 14:23:07 +0100
Subject: better cross-browser compatibility for td hover colour

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c95909085..3f7cc6107 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2073,7 +2073,7 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	border-bottom-right-radius: $radiuspx;
 }
 
-[id^="cloud-index-"]:hover,
+[id^="cloud-index-"]:hover td,
 .cloud-index-active {
 	background-color: $item_colour;
 }
-- 
cgit v1.2.3