aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-31 00:50:20 -0800
committerfriendica <info@friendica.com>2015-01-31 00:50:20 -0800
commite6a5f7800390e5091743d6a97c6fd8f54c5d1530 (patch)
tree20c49c7d11b411b91530ef43374a208274ebbb57 /view
parent4a243b63f7019a1e56ecf03b138cd7fc396236c2 (diff)
parent3e5226adc70838c784a0b208de25fffde37a6679 (diff)
downloadvolse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.gz
volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.bz2
volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.zip
Merge branch 'master' into tres
Conflicts: include/zot.php
Diffstat (limited to 'view')
-rw-r--r--view/js/autocomplete.js2
-rw-r--r--view/theme/redbasic/css/style.css2
-rwxr-xr-xview/tpl/admin_site.tpl3
-rwxr-xr-xview/tpl/direntry.tpl12
-rwxr-xr-xview/tpl/event_form.tpl2
5 files changed, 17 insertions, 4 deletions
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) {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 73b13c1bf..3631b1d4b 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2075,7 +2075,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;
}
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>
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index cdc6f1f97..6ba86a085 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}}+
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index dbad6579e..1cea156dd 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -44,7 +44,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}}