diff options
| author | friendica <info@friendica.com> | 2013-03-21 02:21:56 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-03-21 02:21:56 -0700 |
| commit | d9492a4a7687ba3804fcb353d916002b8fb2853d (patch) | |
| tree | 52428574e452bf01db114cdb24599ddae3791edd /view/tpl | |
| parent | 4b22c6e531739d96fbe9c78f629aa34c35acb821 (diff) | |
| parent | 6db6f6640e73b85ddedbcbacb60f06b185372065 (diff) | |
| download | volse-hubzilla-d9492a4a7687ba3804fcb353d916002b8fb2853d.tar.gz volse-hubzilla-d9492a4a7687ba3804fcb353d916002b8fb2853d.tar.bz2 volse-hubzilla-d9492a4a7687ba3804fcb353d916002b8fb2853d.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/nav.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/profile_edit.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/smarty3/nav.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/smarty3/profile_edit.tpl | 9 |
4 files changed, 24 insertions, 0 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 7b11c3794..e97064d5f 100644 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -58,6 +58,9 @@ </li> {{ endif }} + {{ if $nav.register }}<li id="nav-register-link" class="nav-menu $nav.register.2"><a href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a><li>{{ endif }} + + {{ if $nav.messages }} <li id="nav-mail-link" class="nav-menu $sel.messages"> <a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a> diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index a498f3a65..6ff4cf8c1 100644 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -206,6 +206,15 @@ $lbl_social </div> <div id="contact-jot-end"></div> +<div id="channels-jot-wrapper" > +<p id="channels-jot-desc" > +$lbl_channels +</p> + +<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >$channels</textarea> + +</div> +<div id="channels-jot-end"></div> <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl index 3774333bb..beddc9109 100644 --- a/view/tpl/smarty3/nav.tpl +++ b/view/tpl/smarty3/nav.tpl @@ -63,6 +63,9 @@ </li> {{/if}} + {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} + + {{if $nav.messages}} <li id="nav-mail-link" class="nav-menu {{$sel.messages}}"> <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a> diff --git a/view/tpl/smarty3/profile_edit.tpl b/view/tpl/smarty3/profile_edit.tpl index 3a2652a68..864599244 100644 --- a/view/tpl/smarty3/profile_edit.tpl +++ b/view/tpl/smarty3/profile_edit.tpl @@ -211,6 +211,15 @@ </div> <div id="contact-jot-end"></div> +<div id="channels-jot-wrapper" > +<p id="channels-jot-desc" > +{{$lbl_channels}} +</p> + +<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea> + +</div> +<div id="channels-jot-end"></div> <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> |