diff options
| author | mrjive <mrjive@mrjive.it> | 2016-01-21 09:51:32 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2016-01-21 09:51:32 +0100 |
| commit | c49e4f52ae83441c4a1dcf52e433dded8d767679 (patch) | |
| tree | 0a558e33ed4b77a56186721cf13844ba7b28af24 /view/tpl | |
| parent | 763c700372ee91f3f840c6fba915cb4d941c34a0 (diff) | |
| parent | 1d891984441fa2f4aa8e311191da23e9ddd6e928 (diff) | |
| download | volse-hubzilla-c49e4f52ae83441c4a1dcf52e433dded8d767679.tar.gz volse-hubzilla-c49e4f52ae83441c4a1dcf52e433dded8d767679.tar.bz2 volse-hubzilla-c49e4f52ae83441c4a1dcf52e433dded8d767679.zip | |
Merge pull request #18 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/direntry.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/oexchange_xrd.tpl | 12 |
3 files changed, 10 insertions, 9 deletions
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 57e6e1555..7c2a45473 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,6 +1,9 @@ <div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" > <div class="section-subtitle-wrapper"> <div class="pull-right"> + {{if $entry.viewrate}} + {{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}} + {{/if}} {{if $entry.ignlink}} <a class="directory-ignore btn btn-warning btn-xs" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a> {{/if}} @@ -8,9 +11,7 @@ <a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a> {{/if}} {{if $entry.viewrate}} - {{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}} {{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" > *</span></button>{{/if}} - {{/if}} </div> <h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i> {{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3> diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index a2159c885..61ede1ca2 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@ <body> <table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;"> <tbody> - <tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/hz-white-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> + <tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src="{{$notify_icon}}"><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> <tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr> diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl index 74ef22874..e865e07d9 100755 --- a/view/tpl/oexchange_xrd.tpl +++ b/view/tpl/oexchange_xrd.tpl @@ -4,23 +4,23 @@ <Subject>{{$base}}</Subject> <Property - type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property> + type="http://www.oexchange.org/spec/0.8/prop/vendor">Zotlabs</Property> <Property - type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property> + type="http://www.oexchange.org/spec/0.8/prop/title">Hubzilla</Property> <Property - type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property> + type="http://www.oexchange.org/spec/0.8/prop/name">Hubzilla</Property> <Property - type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property> + type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Hubzilla</Property> <Link rel="icon" - href="{{$base}}/images/friendika-16.png" + href="{{$base}}/images/hz-16.png" type="image/png" /> <Link rel="icon32" - href="{{$base}}/images/friendika-32.png" + href="{{$base}}/images/hz-32.png" type="image/png" /> |