diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/nl/hstrings.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.css | 8 | ||||
| -rwxr-xr-x | view/tpl/connection_template.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/email_notify_text.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/group_side.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/new_channel.tpl | 3 |
7 files changed, 18 insertions, 7 deletions
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php index dca353ba7..ca021ad76 100644 --- a/view/nl/hstrings.php +++ b/view/nl/hstrings.php @@ -262,7 +262,7 @@ $a->strings["View Profile"] = "Profiel weergeven"; $a->strings["Activity/Posts"] = "Activiteit/berichten connectie"; $a->strings["Edit Connection"] = "Connectie bewerken"; $a->strings["Message"] = "Bericht"; -$a->strings["Ratings"] = "Waarderingen"; +$a->strings["Ratings"] = "Beoordelingen"; $a->strings["%s likes this."] = "%s vindt dit leuk."; $a->strings["%s doesn't like this."] = "%s vindt dit niet leuk."; $a->strings["<span %1\$s>%2\$d people</span> like this."] = array( @@ -1824,7 +1824,7 @@ $a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afs $a->strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)"; $a->strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"; $a->strings["No ratings"] = "Geen beoordelingen"; -$a->strings["Rating: "] = "Waardering: "; +$a->strings["Rating: "] = "Beoordeling: "; $a->strings["Website: "] = "Website: "; $a->strings["Description: "] = "Omschrijving: "; $a->strings["Select a bookmark folder"] = "Kies een bladwijzermap"; diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index f65e9aac9..b667dca5c 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -10,7 +10,13 @@ } #profile-photo-wrapper { - border:none; + border: none; +} + +#profile-edit-default-desc { + background-color: #665029; + color: #FFF; + padding: 20px; } .photo { diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 143989971..e2a14d9a2 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -1,9 +1,12 @@ <div id="contact-entry-wrapper-{{$contact.id}}"> <div class="section-subtitle-wrapper"> <div class="pull-right"> - {{if $contact.approve}} + {{if $contact.approve && $contact.ignore}} <form action="connedit/{{$contact.id}}" method="post" > <button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button> + + <a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-xs" title="{{$contact.ignore_hover}}"><i class="icon-ban-circle"></i> {{$contact.ignore}}</a> + {{/if}} <a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a> <a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a> diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 61ede1ca2..5b4954c8e 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -18,7 +18,7 @@ <tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr> <tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr> <tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr> - <tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr> + <tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr> <tr><td></td><td>{{$thanks}}</td></tr> <tr><td></td><td>{{$site_admin}}</td></tr> </tbody> diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl index bdab4c273..56925c18b 100755 --- a/view/tpl/email_notify_text.tpl +++ b/view/tpl/email_notify_text.tpl @@ -5,6 +5,7 @@ {{$textversion}} {{$tsitelink}} + {{$titemlink}} {{$thanks}} diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 952757076..af6014359 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -16,7 +16,7 @@ </li> {{/foreach}} <li> - <a href="group/new" title="{{$createtext}}" >{{$createtext}}</a> + <a href="group/new" title="{{$createtext}}" ><i class="icon-plus-sign"></i> {{$createtext}}</a> </li> </ul> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 46b32b8a9..156b5ec2f 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -22,8 +22,9 @@ <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div> <label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label> - <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> + <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> <div id="nick-spinner"></div> + <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_hub}}</div> <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="newchannel-nickname-end" class="newchannel-field-end"></div> |