diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/cover_photo.tpl | 42 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/mood_content.tpl | 38 | ||||
| -rw-r--r-- | view/tpl/pdledit.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/profile_photo.tpl | 58 | ||||
| -rwxr-xr-x | view/tpl/register.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/settings_oauth.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/settings_oauth_edit.tpl | 9 |
10 files changed, 100 insertions, 71 deletions
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index 1db139e7b..4352501ae 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -1,23 +1,29 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> +<div id="profile-photo-content" class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> -<form enctype="multipart/form-data" action="cover_photo" method="post"> -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <form enctype="multipart/form-data" action="cover_photo" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -<div id="profile-photo-upload-wrapper"> + <div id="profile-photo-upload-wrapper"> -<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> -<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> -<div class="clear"></div> + <label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> + <input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> + <div class="clear"></div> + <br /> + <br /> + <div id="profile-photo-submit-wrapper"> + <input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}"> + </div> + </div> -<div id="profile-photo-submit-wrapper"> -<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}"> -</div> -</div> - -</form> - -<div id="profile-photo-link-select-wrapper"> -{{$select}} -</div> + </form> + <br /> + <br /> + <div id="profile-photo-link-select-wrapper"> + {{$select}} + </div> + </div> </div> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 8a007232e..322273193 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -28,6 +28,7 @@ var justifiedGalleryActive = false; {{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}} {{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}} + var preloadImages = {{$preload_images}}; </script> diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl index 4059620ce..315ee4c8a 100755 --- a/view/tpl/mood_content.tpl +++ b/view/tpl/mood_content.tpl @@ -5,27 +5,29 @@ </div> <div class="section-content-wrapper"> - <div id="mood-desc">{{$desc}}</div> + <div id="mood-desc">{{$desc}}</div> -<br /> -<br /> + <br /> + <br /> -<form action="mood" method="get"> -<br /> -<br /> + <form action="mood" method="get"> + <br /> + <br /> -<input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" /> + <input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" /> -<div class="form-group field custom"> - <select name="verb" id="mood-verb-select" class="form-control" > - {{foreach $verbs as $v}} - <option value="{{$v.0}}">{{$v.1}}</option> - {{/foreach}} - </select> -</div> -<br /> -<br /> -<input type="submit" name="submit" value="{{$submit}}" /> -</form> + <div class="form-group field custom"> + <select name="verb" id="mood-verb-select" class="form-control" > + {{foreach $verbs as $v}} + <option value="{{$v.0}}">{{$v.1}}</option> + {{/foreach}} + </select> + </div> + <br /> + <br /> + <input type="submit" name="submit" value="{{$submit}}" /> + </form> + </div> +</div> diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index 9df93e4c6..af8e37602 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> <h2>{{$mname}} {{$module}}</h2> @@ -17,5 +18,4 @@ <input type="submit" name="submit" value="{{$submit}}" /> </form> - - +</div> diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index fbed32606..88e17407b 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -1,31 +1,43 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> +<div id="profile-photo-content" class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> -<form enctype="multipart/form-data" action="profile_photo" method="post"> -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <form enctype="multipart/form-data" action="profile_photo" method="post"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> -<div id="profile-photo-upload-wrapper"> + <div id="profile-photo-upload-wrapper"> -<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> -<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> -<div class="clear"></div> + <label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label> + <input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" /> + <div class="clear"></div> -<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label> -<select name="profile" id="profile-photo-profiles" class="form-input" > -{{foreach $profiles as $p}} -<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option> -{{/foreach}} -</select> -<div class="clear"></div> + {{if $single}} + <input type="hidden" name="profile" value="{{$profile0.id}}" /> + {{else}} -<div id="profile-photo-submit-wrapper"> -<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}"> -</div> -</div> + <label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label> + <select name="profile" id="profile-photo-profiles" class="form-control" > + {{foreach $profiles as $p}} + <option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option> + {{/foreach}} + </select> + <div class="clear"></div> + <br /> + <br /> + {{/if}} -</form> + <div id="profile-photo-submit-wrapper"> + <input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}"> + </div> + </div> -<div id="profile-photo-link-select-wrapper"> -{{$select}} -</div> + </form> + <br /> + <br /> + <div id="profile-photo-link-select-wrapper"> + {{$select}} + </div> + </div> </div> diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index b72e069c3..6c1bc87a4 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -31,14 +31,12 @@ {{include file="field_select_grouped.tpl" field=$role}} <div id="newchannel-role-end" class="newchannel-field-end"></div> {{/if}} - - <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div> - <label for="newchannel-name" id="label-newchannel-name" class="register-label" >{{$label_name}}</label> <input type="text" name="name" id="newchannel-name" class="register-input" value="{{$name}}" /> <div id="name-spinner"></div> <div id="newchannel-name-feedback" class="register-feedback"></div> <div id="newchannel-name-end" class="register-field-end"></div> + <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div> {{/if}} @@ -62,12 +60,13 @@ <div id="register-password2-end" class="register-field-end"></div> {{if $auto_create}} - <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div> <label for="newchannel-nickname" id="label-newchannel-nickname" class="register-label" >{{$label_nick}}</label> <input type="text" name="nickname" id="newchannel-nickname" class="register-input" value="{{$nickname}}" /> <div id="nick-spinner"></div> + <div id="newchannel-nick-desc" style="text-align: right;">{{$nick_hub}}</div> <div id="newchannel-nickname-feedback" class="register-feedback"></div> <div id="newchannel-nickname-end" class="register-field-end"></div> + <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div> {{/if}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 820ffd711..6f50f820a 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i> {{$removeme}}</a> + {{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i> {{$removeme}}</a>{{/if}} <h2>{{$ptitle}}</h2> <div class="clear"></div> </div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 02f679852..cf79671fd 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -65,6 +65,7 @@ {{include file="field_checkbox.tpl" field=$channel_list_mode}} {{include file="field_checkbox.tpl" field=$network_list_mode}} {{include file="field_checkbox.tpl" field=$user_scalable}} + {{include file="field_checkbox.tpl" field=$preload_images}} {{if $expert}} <div class="form-group"> <a class="btn btn-default "href="pdledit">{{$layout_editor}}</a> diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 20e8f458f..94d76028a 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -1,7 +1,9 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> - +<div class="generic-content-wrapper"> +<div class="section-title-wrapper"> + <h2>{{$title}}</h2> +</div> +<div class="section-content-tools-wrapper"> <form action="settings/oauth" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -31,3 +33,4 @@ </form> </div> +</div> diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl index bf805363c..b94dec48a 100755 --- a/view/tpl/settings_oauth_edit.tpl +++ b/view/tpl/settings_oauth_edit.tpl @@ -1,5 +1,8 @@ -<h1>{{$title}}</h1> - +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> +<div class="section-content-tools-wrapper"> <form method="POST"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -15,3 +18,5 @@ </div> </form> +</div> +</div> |