diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-18 08:41:41 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-18 08:41:41 +0200 |
| commit | 7da97c198182f8f6f4286e16d80de205431d81bb (patch) | |
| tree | d03c22c98fa5e522fef874554be307969154c792 /view/tpl | |
| parent | 4f793069bf4aafcfe77d50e47690173104ef23c7 (diff) | |
| parent | 0b47fb9a91b58147e616ea75a23dea0d431c40f8 (diff) | |
| download | volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.gz volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.bz2 volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.zip | |
Merge pull request #3 from friendica/master
Merge from upstream
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/comment_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/new_channel.tpl | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 351cc8e14..e68314797 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -58,7 +58,7 @@ <i class="icon-eye-open comment-icon" ></i> </button> {{/if}} - <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> + <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> </div> </div> <div class="clear"></div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c4fdba0f5..c51dc02a5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -85,7 +85,7 @@ <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="submit">{{$share}}</button> + <button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 261f965da..b28810236 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -4,8 +4,16 @@ <div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div> + <div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div> + + <label for="newchannel-role" id="label-newchannel-role" class="newchannel-label" >{{$label_role}}</label> + {{$role_select}} + <div id="newchannel-role-end" class="newchannel-field-end"></div> + + <label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label> <input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" /> + <div id="name-spinner"></div> <div id="newchannel-name-feedback" class="newchannel-feedback"></div> <div id="newchannel-name-end" class="newchannel-field-end"></div> @@ -13,6 +21,7 @@ <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}}" /> + <div id="nick-spinner"></div> <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="newchannel-nickname-end" class="newchannel-field-end"></div> |