diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_connedit.css | 9 | ||||
| -rw-r--r-- | view/css/mod_prep.css | 8 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/pdl/mod_prep.pdl | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 17 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/cloud_header.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/poco_entry_xml.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/prep.tpl | 28 | ||||
| -rw-r--r-- | view/tpl/rating_slider.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/xchan_vcard.tpl | 2 |
13 files changed, 85 insertions, 6 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/css/mod_prep.css b/view/css/mod_prep.css new file mode 100644 index 000000000..3701cbdff --- /dev/null +++ b/view/css/mod_prep.css @@ -0,0 +1,8 @@ +.contact-photo-wrapper { + float: left; + width: 120px; +} + +.prep-details { + float: left; +}
\ No newline at end of file diff --git a/view/js/main.js b/view/js/main.js index 0c56c8d41..fac5e1143 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1125,7 +1125,7 @@ $(document).ready(function() { $(".autotime").timeago(); - $("#toc").toc({content: "div.page-body", headings: "h1,h2,h3,h4"}); + $("#toc").toc({content: "body", headings: "h1,h2,h3,h4"}); }); diff --git a/view/pdl/mod_prep.pdl b/view/pdl/mod_prep.pdl new file mode 100644 index 000000000..3d40386cd --- /dev/null +++ b/view/pdl/mod_prep.pdl @@ -0,0 +1,5 @@ +[region=aside] +[widget=vcard][/widget] +[widget=suggestions][/widget] +[widget=findpeople][/widget] +[/region] diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 842e7063a..c24bee1fd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1031,6 +1031,7 @@ footer { #colorbox { border: 0px solid $fancybox_bgcolour; background-color: $fancybox_bgcolour; + z-index: 9; } .settings-block { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 5d44a9b9d..5bc702d8c 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -275,7 +275,7 @@ if(! $a->install) { if(! $chat_txtbgcol) $chat_txtbgcol = "#EEE"; if(! $fancybox_bgcolour) - $fancybox_bgcolour = "#FFF"; + $fancybox_bgcolour = "#FFFFFF"; if (!$comment_padding) $comment_padding="0px"; if (!$comment_border_left) 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/attach_edit.tpl b/view/tpl/attach_edit.tpl index 0147d35ba..5a8743919 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -14,7 +14,7 @@ <i class="icon-share jot-icons"></i> </button> </div> - <div id="attach-edit-tools-perms" class="form-group pull-right{{if $isadir}} btn-group{{/if}}"> + <div id="attach-edit-tools-perms" class="form-group pull-right btn-group"> {{if $isadir}} <div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons"> <label class="btn btn-default btn-xs" title="{{$recurse}}"> @@ -22,6 +22,11 @@ </label> </div> {{/if}} + <div id="attach-edit-activity" class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-xs" title="{{$activity_btn_title}}"> + <input type="checkbox" autocomplete="off" name="no_activity" value="1"><i class="icon-ban-circle jot-icons"></i> + </label> + </div> <div id="attach-edit-perms" class="btn-group"> <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index f5f123edb..403323085 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,8 +1,9 @@ <div class="section-title-wrapper"> {{if $actionspanel}} <div class="pull-right"> - <button id="files-create-btn"class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i> Create</button> - <button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i> Upload</button> + <a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i> {{$shared}}</a> + <button id="files-create-btn" class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i> {{$create}}</button> + <button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i> {{$upload}}</button> </div> {{/if}} <h2>{{$header}}</h2> 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..49dea7d72 --- /dev/null +++ b/view/tpl/prep.tpl @@ -0,0 +1,28 @@ +<h1>{{$header}}</h1> + +{{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_m}}" alt="{{$r.xchan_addr}}" title="{{$r.xchan_addr}}" /></a> +</div> +</div> +<div class="prep-details"> +<a href="{{$r.xchan_url}}" class="directory-profile-link" id="directory-profile-link-{{$r.xchan_hash}}" ><div class="contact-name">{{$r.xchan_name}}</div></a> +{{$rating_lbl}} {{$r.xlink_rating}} +{{if $r.xlink_rating_text}} +{{$rating_text_label}} {{$r.xlink_rating_text}} +{{/if}} +</div> +<div class="clear"></div> +</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> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index 929965727..b72250bec 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,6 +1,6 @@ <div class="vcard"> <div class="fn">{{$name}}</div> -<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></div> +<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div> </div> |