diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/contact_block.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/oexchange_xrd.tpl | 12 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 13 | ||||
| -rw-r--r-- | view/tpl/removeaccount.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/removeme.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/xchan_vcard.tpl | 9 |
7 files changed, 22 insertions, 24 deletions
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl index d1ce5ca67..a32437212 100755 --- a/view/tpl/contact_block.tpl +++ b/view/tpl/contact_block.tpl @@ -1,7 +1,9 @@ -<div id="contact-block"> -<div id="contact-block-numcontacts">{{$contacts}}</div> +<div id="contact-block" class="widget"> +<h3>{{$contacts}}</h3> {{if $micropro}} + {{if $viewconnections}} <a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a> + {{/if}} <div class='contact-block-content'> {{foreach $micropro as $m}} {{$m}} 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" /> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index c52c2cd81..5857ae5d1 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,8 @@ <div class="vcard"> <div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> + {{if $connect}} + <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div> + {{/if}} {{if $profile.edit}} <div class="dropdown"> <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> @@ -45,16 +48,10 @@ {{if $diaspora}} {{include file="diaspora_vcard.tpl"}} {{/if}} - -{{if $connect}} -<a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a> -{{/if}} - -{{$rating}} - </div> -<div id="vcard-end"></div> +<div id="clear"></div> +{{$rating}} {{$chanmenu}} diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl index aefcd51a8..ce6c8ac22 100644 --- a/view/tpl/removeaccount.tpl +++ b/view/tpl/removeaccount.tpl @@ -10,7 +10,7 @@ <input type="hidden" name="verify" value="{{$hash}}" /> <div class="form-group" id="remove-account-pass-wrapper"> <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> - <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" /> + <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> {{include file="field_checkbox.tpl" field=$global}} <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index 5b329dd6d..40b9546d2 100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -10,7 +10,7 @@ <input type="hidden" name="verify" value="{{$hash}}" /> <div class="form-group" id="remove-account-pass-wrapper"> <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> - <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" /> + <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> {{include file="field_checkbox.tpl" field=$global}} <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index 2acbb24e4..ad409d75b 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,11 +1,10 @@ <div class="vcard"> <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div> +{{if $connect}} +<div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div> +{{/if}} <div class="fn">{{$name}}</div> </div> -{{if $mode != 'mail'}} -{{if $connect}} - <a href="follow?f=&url={{$follow}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a> -{{/if}} -{{/if}} + |