diff options
| author | friendica <info@friendica.com> | 2015-01-31 00:50:20 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-31 00:50:20 -0800 |
| commit | e6a5f7800390e5091743d6a97c6fd8f54c5d1530 (patch) | |
| tree | 20c49c7d11b411b91530ef43374a208274ebbb57 /view/tpl | |
| parent | 4a243b63f7019a1e56ecf03b138cd7fc396236c2 (diff) | |
| parent | 3e5226adc70838c784a0b208de25fffde37a6679 (diff) | |
| download | volse-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/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/direntry.tpl | 12 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 2 |
3 files changed, 15 insertions, 2 deletions
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}} |