diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_mail.css | 2 | ||||
| -rw-r--r-- | view/css/mod_register.css | 37 | ||||
| -rw-r--r-- | view/js/mod_register.js | 21 | ||||
| -rwxr-xr-x | view/tpl/admin_plugins.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/admin_plugins_details.tpl | 19 | ||||
| -rwxr-xr-x | view/tpl/cover_photo.tpl | 23 | ||||
| -rwxr-xr-x | view/tpl/cropcover.tpl | 58 | ||||
| -rwxr-xr-x | view/tpl/register.tpl | 34 |
8 files changed, 196 insertions, 4 deletions
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css index 843d1274c..c1874edac 100644 --- a/view/css/mod_mail.css +++ b/view/css/mod_mail.css @@ -26,7 +26,7 @@ } #prvmail-text { - height: 20.0em; + height: 15.0em; } .mail-conv-outside-wrapper { diff --git a/view/css/mod_register.css b/view/css/mod_register.css index 618b7ce95..890a3f76b 100644 --- a/view/css/mod_register.css +++ b/view/css/mod_register.css @@ -42,3 +42,40 @@ h2 { margin-bottom: 20px; } +#newchannel-form { + font-size: 1.4em; + margin-left: 15%; + margin-top: 20px; + width: 50%; +} + +#newchannel-form .descriptive-paragraph { + color: #888; + margin-left: 20px; + margin-bottom: 25px; +} + +.newchannel-label { + float: left; + width: 275px; +} + +.newchannel-role-morehelp { + float: left; + width: 32px; +} +.newchannel-input { + float: left; + width: 275px; + padding: 5px; +} + +.newchannel-feedback { + float: left; + margin-left: 5px; +} + +.newchannel-field-end { + clear: both; + margin-bottom: 20px; +} diff --git a/view/js/mod_register.js b/view/js/mod_register.js index 95bc7bbbb..8430b4655 100644 --- a/view/js/mod_register.js +++ b/view/js/mod_register.js @@ -26,4 +26,25 @@ $(document).ready(function() { zFormError("#register-password2-feedback", false); } }); + + + $("#newchannel-name").blur(function() { + $("#name-spinner").spin('small'); + var zreg_name = $("#newchannel-name").val(); + $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { + $("#newchannel-nickname").val(data); + zFormError("#newchannel-name-feedback",data.error); + $("#name-spinner").spin(false); + }); + }); + $("#newchannel-nickname").blur(function() { + $("#nick-spinner").spin('small'); + var zreg_nick = $("#newchannel-nickname").val(); + $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { + $("#newchannel-nickname").val(data); + zFormError("#newchannel-nickname-feedback",data.error); + $("#nick-spinner").spin(false); + }); + }); + });
\ No newline at end of file diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 0f76cc4fe..0da214c17 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -4,8 +4,12 @@ <ul id='pluginslist'> {{foreach $plugins as $p}} <li class='plugin {{$p.1}}'> + {{if ! $p.2.disabled}} <a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='{{if $p.1==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i></a> - <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span> + {{else}} + <i class='icon-stop admin-icons'></i> + {{/if}} + <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>{{if $p.2.disabled}} {{$disabled}}{{/if}} {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} <div class='desc'>{{$p.2.description}}</div> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 6225ae7bf..721bd3573 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,7 +1,12 @@ <div class = "generic-content-wrapper-styled" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> - - <p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a></p> + + <p>{{if ! $info.disabled}}<i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i>{{else}}<i class='icon-stop admin-icons'></i>{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a>{{/if}}</p> + + {{if $info.disabled}} + <p>{{$disabled}}</p> + {{/if}} + <p>{{$info.description}}</p> {{foreach $info.author as $a}} @@ -10,6 +15,16 @@ </p> {{/foreach}} + {{if $info.minversion}} + <p class="versionlimit">{{$str_minversion}}{{$info.minversion}}</p> + {{/if}} + {{if $info.maxversion}} + <p class="versionlimit">{{$str_maxversion}}{{$info.maxversion}}</p> + {{/if}} + {{if $info.minphpversion}} + <p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p> + {{/if}} + {{foreach $info.maintainer as $a}} <p class="maintainer">{{$str_maintainer}} diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl new file mode 100755 index 000000000..1db139e7b --- /dev/null +++ b/view/tpl/cover_photo.tpl @@ -0,0 +1,23 @@ +<div class="generic-content-wrapper-styled"> +<h1>{{$title}}</h1> + +<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"> + +<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> + +<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> +</div> diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl new file mode 100755 index 000000000..68c948889 --- /dev/null +++ b/view/tpl/cropcover.tpl @@ -0,0 +1,58 @@ +<h1>{{$title}}</h1> +<p id="cropimage-desc"> +{{$desc}} +</p> +<div id="cropimage-wrapper"> +<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" /> +</div> +<div id="cropimage-preview-wrapper" > +<div id="previewWrap" ></div> +</div> + +<script type="text/javascript" language="javascript"> + + function onEndCrop( coords, dimensions ) { + $( 'x1' ).value = coords.x1; + $( 'y1' ).value = coords.y1; + $( 'x2' ).value = coords.x2; + $( 'y2' ).value = coords.y2; + $( 'width' ).value = dimensions.width; + $( 'height' ).value = dimensions.height; + } + + Event.observe( window, 'load', function() { + new Cropper.ImgWithPreview( + 'croppa', + { + previewWrap: 'previewWrap', + minWidth: 240, + minHeight: 87, + maxWidth: 320, + maxHeight: 320, + ratioDim: { x: 100, y:36 }, + displayOnInit: true, + onEndCrop: onEndCrop + } + ); + } + ); + +</script> + +<form action="cover_photo/{{$resource}}" id="crop-image-form" method="post" /> +<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + +<input type='hidden' name='profile' value='{{$profile}}'> +<input type="hidden" name="cropfinal" value="1" /> +<input type="hidden" name="xstart" id="x1" /> +<input type="hidden" name="ystart" id="y1" /> +<input type="hidden" name="xfinal" id="x2" /> +<input type="hidden" name="yfinal" id="y2" /> +<input type="hidden" name="height" id="height" /> +<input type="hidden" name="width" id="width" /> + +<div id="crop-image-submit-wrapper" > +<input type="submit" name="submit" value="{{$done}}" /> +</div> + +</form> diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 005b122cf..b72e069c3 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -22,6 +22,30 @@ <div id="register-invite-end" class="register-field-end"></div> {{/if}} + {{if $auto_create}} + + {{if $default_role}} + <input type="hidden" name="permissions_role" value="{{$default_role}}" /> + {{else}} + <div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div> + {{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> + + + {{/if}} + + + + <label for="register-email" id="label-register-email" class="register-label" >{{$label_email}}</label> <input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="{{$email}}" /> <div id="register-email-feedback" class="register-feedback"></div> @@ -37,6 +61,16 @@ <div id="register-password2-feedback" class="register-feedback"></div> <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-nickname-feedback" class="register-feedback"></div> + <div id="newchannel-nickname-end" class="register-field-end"></div> + + {{/if}} + {{if $enable_tos}} <input type="checkbox" name="tos" id="register-tos" value="1" /> <label for="register-tos" id="label-register-tos">{{$label_tos}}</label> |