diff options
| author | lsces <lester@lsces.co.uk> | 2014-05-31 23:09:00 +0100 |
|---|---|---|
| committer | lsces <lester@lsces.co.uk> | 2014-05-31 23:09:00 +0100 |
| commit | 04c94e472df94d01cb7bbb0b1ddacdee7429f3a6 (patch) | |
| tree | 0578867ce63af632c81e3a49422217e74b37d19e | |
| parent | 0a7efe8eb1e91e385bf47c0121211ca964fb73fc (diff) | |
| download | users-04c94e472df94d01cb7bbb0b1ddacdee7429f3a6.tar.gz users-04c94e472df94d01cb7bbb0b1ddacdee7429f3a6.tar.bz2 users-04c94e472df94d01cb7bbb0b1ddacdee7429f3a6.zip | |
Modify templates for ink frameworkINK_Port
33 files changed, 301 insertions, 309 deletions
diff --git a/templates/admin_assign_role_user.tpl b/templates/admin_assign_role_user.tpl index 4e34f17..9d88189 100644 --- a/templates/admin_assign_role_user.tpl +++ b/templates/admin_assign_role_user.tpl @@ -13,21 +13,21 @@ {form legend="User Information" action="`$smarty.const.USERS_PKG_URL`admin/assign_role_user.php"} <input type="hidden" value="{$assignUser->mUserId}" name="assign_user" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Username"} {forminput} {$assignUser->getDisplayName(TRUE)} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Email"} {forminput} {$assignUser->mInfo.email} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="User ID"} {forminput} {$assignUser->mUserId} @@ -35,8 +35,7 @@ </div> {if $gBitSystem->isPackageActive('quota')} - {include_php file="`$smarty.const.QUOTA_PKG_PATH`quota_inc.php"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Quota"} {forminput} {$usage} / {$quota}MB ( {$quotaPercent}% ) @@ -44,7 +43,7 @@ </div> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Roles"} {forminput} {foreach from=$assignUser->mRoles key=roleId item=role} @@ -59,7 +58,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Default Role" for="default_role"} {forminput} <select name="default_role" id="default_role"> @@ -71,7 +70,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" value="{tr}set{/tr}" name="set_default" /> + <input type="submit" class="ink-button" value="{tr}set{/tr}" name="set_default" /> </div> {/form} diff --git a/templates/admin_assign_user.tpl b/templates/admin_assign_user.tpl index 34e8f37..0d56a99 100644 --- a/templates/admin_assign_user.tpl +++ b/templates/admin_assign_user.tpl @@ -13,21 +13,21 @@ {form legend="User Information" action="`$smarty.const.USERS_PKG_URL`admin/assign_user.php"} <input type="hidden" value="{$assignUser->mUserId}" name="assign_user" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Username"} {forminput} {$assignUser->getDisplayName(TRUE)} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Email"} {forminput} {$assignUser->mInfo.email} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="User ID"} {forminput} {$assignUser->mUserId} @@ -35,7 +35,7 @@ </div> {if $gBitSystem->isPackageActive('quota')} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Quota"} {forminput} {$usage} / {$quota}MB ( {$quotaPercent}% ) @@ -43,7 +43,7 @@ </div> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Groups"} {forminput} {foreach from=$assignUser->mGroups key=groupId item=group} @@ -58,7 +58,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Default Group" for="default_group"} {forminput} <select name="default_group" id="default_group"> @@ -70,7 +70,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" value="{tr}set{/tr}" name="set_default" /> + <input type="submit" class="ink-button" value="{tr}set{/tr}" name="set_default" /> </div> {/form} diff --git a/templates/admin_group_edit.tpl b/templates/admin_group_edit.tpl index 65d3297..4a5aa16 100644 --- a/templates/admin_group_edit.tpl +++ b/templates/admin_group_edit.tpl @@ -18,23 +18,23 @@ {jstabs} {jstab title="Edit Group"} - {form} + {form legend="Add or Edit a Group"} <input type="hidden" name="group_id" value="{$groupInfo.group_id}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Group" for="groups_group"} {forminput} <input type="text" name="name" id="groups_group" size="30" maxlength="30" value="{$groupInfo.group_name}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Description" for="group_desc"} {forminput} <textarea rows="5" cols="20" name="desc" id="group_desc">{$groupInfo.group_desc}</textarea> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Group home page" for="group_home"} {forminput} <input type="text" name="home" id="group_home" value="{$groupInfo.group_home|escape}" /> @@ -48,13 +48,13 @@ {* {html_options name="dummy" id="content-list" values=$contentList options=$contentList onchange="document.getElementById('group_home').value=options[selectedIndex].value;"} <input type="text" size="30" name="find" value="{$smarty.request.find}" /> - <input type="submit" class="btn btn-default" value="{tr}Apply filter{/tr}" name="search_objects" /> + <input type="submit" class="ink-button" value="{tr}Apply filter{/tr}" name="search_objects" /> <br /> *} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="After registration page" for="after_registration_page"} {forminput} <input type="text" name="after_registration_page" id="after_registration_page" value="{$groupInfo.after_registration_page|escape}" /> @@ -62,21 +62,21 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" id="default_home" name="default_home_group" {if $groupInfo.group_id eq $defaultGroupId}checked="checked"{/if} value="y" />Default home page {formhelp note="This is the home page if a user belongs to many groups. Only one group may be the default home. If none is selected, users/my.php is the default."} </label> </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="is_default" value="y" {if $groupInfo.is_default eq 'y'}checked="checked"{/if} id="is_default" />Auto members {formhelp note="Users are automatically added to this group when registering at your site."} </label> </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="is_public" value="y" {if $groupInfo.is_public eq 'y'}checked="checked"{/if} id="is_public" />Is public {formhelp note="A user will be able to select this group at registration."} @@ -84,21 +84,20 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" /> - {if $groupInfo.group_name}<input type="submit" class="btn btn-default" name="delete" value="{tr}Delete Group{/tr}" /> {/if} - <input type="submit" class="btn btn-default" name="save" value="{tr}Save Group{/tr}" /> + <input type="submit" class="ink-button" name="cancel" value="{tr}Cancel{/tr}" /> + <input type="submit" class="ink-button" name="save" value="{tr}Save Group{/tr}" /> </div> {/form} {/jstab} {if $groupInfo.group_id} {jstab title="Assign Permissions"} - {form} + {form legend="Assign permissions"} <input type="hidden" name="group_id" value="{$groupInfo.group_id}" /> <input type="hidden" name="package" value="{$smarty.request.package|escape}" /> <input type="hidden" name="perm_name[{$perms[user].perm_name}]" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Display permissions of package"} {forminput} {smartlink ititle="All packages" group_id=$groupInfo.group_id} @@ -110,8 +109,8 @@ {/forminput} </div> - <div class="control-group"> - <table class="table data table-hover"> + <div class="control-group column-group gutters"> + <table class="table data"> <tr> <th> </th> <th>{smartlink ititle="Name" isort="up.perm_name" group_id=$groupInfo.group_id offset=$offset package=$smarty.request.package}</th> @@ -132,7 +131,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="updateperms" value="{tr}Update{/tr}" /> + <input type="submit" class="ink-button" name="updateperms" value="{tr}Update{/tr}" /> </div> {/form} {/jstab} diff --git a/templates/admin_groups_list.tpl b/templates/admin_groups_list.tpl index 33411f9..900bd37 100644 --- a/templates/admin_groups_list.tpl +++ b/templates/admin_groups_list.tpl @@ -1,14 +1,12 @@ {strip} <div class="listing users"> <div class="header"> - <a class="btn btn-primary btn-xs pull-right" href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?action=create"><i class="icon-group"></i> {tr}Add a new group{/tr}</a> + <a class="btn btn-primary btn-mini pull-right" href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?action=create"><i class="icon-group"></i> {tr}Add a new group{/tr}</a> <h1>{tr}List of existing groups{/tr}</h1> </div> <div class="body"> - {formfeedback success=$successMsg error=$errorMsg} - <ul class="inline navbar"> <li>{booticon iname="icon-circle-arrow-right" ipackage="icons" iexplain="sort by"}</li> <li>{smartlink ititle="Name" isort="group_name" offset=$offset idefault=1}</li> @@ -16,6 +14,8 @@ <li>{smartlink ititle="Home Page" isort="group_home" offset=$offset}</li> </ul> + {formfeedback success=$successMsg error=$errorMsg} + <ul class="clear data"> {foreach from=$groupList key=groupId item=grp} <li class="item {cycle values='odd,even'}"> @@ -24,6 +24,7 @@ {smartlink ititle="Group Members" ipackage="users" ifile="admin/edit_group.php" booticon="icon-group" members=$groupId} {if $groupId ne $smarty.const.ANONYMOUS_GROUP_ID} {smartlink ititle="Batch assign" ipackage="users" ifile="admin/edit_group.php" booticon="icon-cogs" batch_assign=$groupId} + {smartlink ititle="Remove" ipackage="users" ifile="admin/edit_group.php" booticon="icon-trash" action=delete group_id=$groupId} {/if} </div> diff --git a/templates/admin_list_users.tpl b/templates/admin_list_users.tpl index 7fcf45c..cffb976 100644 --- a/templates/admin_list_users.tpl +++ b/templates/admin_list_users.tpl @@ -16,14 +16,14 @@ {formfeedback success=$addSuccess} {form legend="Add a new user" secure=$gBitSystem->isFeatureActive("site_https_login_required")} <input type="hidden" name="tab" value="useradd" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Real Name" for="real_name"} {forminput} <input type="text" name="real_name" id="real_name" value="{$newUser.real_name}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.login} {formlabel label="User" for="login"} {forminput} @@ -31,7 +31,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.password} {formlabel label="Password" for="password"} {forminput} @@ -39,14 +39,14 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Repeat Password" for="password2"} {forminput} <input type="password" name="password2" id="password2" value="{$newUser.password2}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.email} {formlabel label="Email" for="email"} {forminput} @@ -54,7 +54,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {if $gBitSystem->isPackageActive('protector')} {if $defaultRoleId eq ''} {formfeedback error="No default role is currently set. Please set one in the Administration --> Users --> <a href=\"`$smarty.const.USERS_PKG_URL`admin/edit_role.php\">Roles and Permissions</a> page"} @@ -76,7 +76,7 @@ {/if} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="<a href=\"javascript:BitBase.genPass('genepass','password','password2');\">{tr}Generate a password{/tr}</a>" for="email"} {forminput} <input id="genepass" type="text" /> @@ -84,7 +84,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {forminput} <label class="checkbox"> <input type="checkbox" name="admin_verify_user" id="admin_verify_user" /> {tr}Validate user by email{/tr} @@ -93,7 +93,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {forminput} <label class="checkbox"> <input type="checkbox" name="admin_verify_email" id="admin_verify_email" /> {tr}Validate email address{/tr} @@ -102,7 +102,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {forminput} <label class="checkbox"> <input type="checkbox" name="admin_noemail_user" id="admin_noemail_user" /> {tr}Don't email added user" for="admin_noemail_user{/tr} @@ -115,9 +115,9 @@ <div class="control-group submit"> {if $gBitSystem->isPackageActive('protector')} - <input type="submit" class="btn btn-default" name="newuser" value="{tr}Add User{/tr}"{if $defaultRoleId eq ''} disabled="disabled"{/if} /> + <input type="submit" class="ink-button" name="newuser" value="{tr}Add User{/tr}"{if $defaultRoleId eq ''} disabled="disabled"{/if} /> {else} - <input type="submit" class="btn btn-default" name="newuser" value="{tr}Add User{/tr}"{if $defaultGroupId eq ''} disabled="disabled"{/if} /> + <input type="submit" class="ink-button" name="newuser" value="{tr}Add User{/tr}"{if $defaultGroupId eq ''} disabled="disabled"{/if} /> {/if} </div> {/form} diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl index cf165c0..121430f 100644 --- a/templates/admin_login.tpl +++ b/templates/admin_login.tpl @@ -3,7 +3,7 @@ {form legend="User Registration and Login"} <input type="hidden" name="page" value="{$page}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback hash=$authSettings.err} {formlabel label="Authentication method"} @@ -33,7 +33,7 @@ </div> {foreach from=$loginSettings key=feature item=output} - <div class="control-group"> + <div class="control-group column-group gutters"> {if $feature == 'users_validate_email' && !$gBitSystem->hasValidSenderEmail()} {formfeedback error="Site <a href=\"`$smarty.const.BIT_ROOT_URL`kernel/admin/index.php?page=server\">emailer return address</a> is not valid!"} {/if} @@ -61,7 +61,7 @@ </div> {/foreach} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Default group for users with verifiable emails" for="users_validate_email_group"} {forminput} @@ -74,7 +74,7 @@ <div class="formhelp">Selecting (none) will prevent the user from registering with a non responsive email. Click <a href='{$smarty.const.USERS_PKG_URL}admin/verify_emails.php?tk={$gBitUser->mTicket}'>here</a> to validate all of your current users emails.</div> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Duration of 'Remember me' feature" for="users_remember_time"} {forminput} <select name="users_remember_time" id="users_remember_time"> @@ -94,7 +94,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {if $roleList } {formlabel label="Roles choice at registration" for="registration_role_choice"} {forminput} @@ -125,7 +125,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="loginprefs" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="loginprefs" value="{tr}Change preferences{/tr}" /> </div> {/form} {/jstab} @@ -137,7 +137,7 @@ <p class="formhelp">{tr}Here you can specify what the registration page should look like. All these settings will still be available from the users preferences page.{/tr}</p> {foreach from=$registerSettings key=feature item=output} - <div class="control-group"> + <div class="control-group column-group gutters"> {forminput} {if $output.type == 'text'} {formlabel label=$output.label for=$feature} @@ -154,7 +154,7 @@ {/foreach} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="registerprefs" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="registerprefs" value="{tr}Change preferences{/tr}" /> </div> {/form} {/jstab} @@ -166,7 +166,7 @@ <div class="control-group warning">{tr}If you turn on any secure login features you must set the HTTP and HTTPS server name.{/tr}</div> {foreach from=$httpSettings key=feature item=output} - <div class="control-group"> + <div class="control-group column-group gutters"> {forminput} {if $output.type == 'text'} {formlabel label=$output.label for=$feature} @@ -183,7 +183,7 @@ {/foreach} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="httpprefs" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="httpprefs" value="{tr}Change preferences{/tr}" /> </div> {/form} {/jstab} @@ -193,7 +193,7 @@ {form legend=$method.name} <input type="hidden" name="page" value="{$page}" /> {foreach from=$method.options item='output' key='op_id'} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$output.label for=$op_id} {forminput} {if $output.type == 'checkbox'} @@ -212,7 +212,7 @@ </div> {/foreach} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="auth_{$meth_name}" value="{tr}Change {$method.name} preferences{/tr}" /> + <input type="submit" class="ink-button" name="auth_{$meth_name}" value="{tr}Change {$method.name} preferences{/tr}" /> </div> {/form} {/jstab} diff --git a/templates/admin_login_role.tpl b/templates/admin_login_role.tpl index 34e0330..313981d 100644 --- a/templates/admin_login_role.tpl +++ b/templates/admin_login_role.tpl @@ -3,7 +3,7 @@ {form legend="User Registration and Login"} <input type="hidden" name="page" value="{$page}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback hash=$authSettings.err} {formlabel label="Authentication method"} @@ -33,7 +33,7 @@ </div> {foreach from=$loginSettings key=feature item=output} - <div class="control-group"> + <div class="control-group column-group gutters"> {if $feature == 'users_validate_email' && !$gBitSystem->hasValidSenderEmail()} {formfeedback error="Site <a href=\"`$smarty.const.BIT_ROOT_URL`kernel/admin/index.php?page=server\">emailer return address</a> is not valid!"} {/if} @@ -58,7 +58,7 @@ </div> {/foreach} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Default role for users with verifiable emails" for="users_validate_email_role"} {forminput} @@ -71,7 +71,7 @@ <div class="formhelp">Selecting (none) will prevent the user from registering with a non responsive email. Click <a href='{$smarty.const.USERS_PKG_URL}admin/verify_emails_role.php?tk={$gBitUser->mTicket}'>here</a> to validate all of your current users emails.</div> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Duration of 'Remember me' feature" for="users_remember_time"} {forminput} <select name="users_remember_time" id="users_remember_time"> @@ -91,7 +91,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Roles choice at registration" for="registration_role_choice"} {forminput} <select name="registration_role_choice[]" multiple="multiple" size="5"> @@ -107,7 +107,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="loginprefs" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="loginprefs" value="{tr}Change preferences{/tr}" /> </div> {/form} {/jstab} @@ -119,7 +119,7 @@ <p class="formhelp">{tr}Here you can specify what the registration page should look like. All these settings will still be available from the users preferences page.{/tr}</p> {foreach from=$registerSettings key=feature item=output} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$output.label for=$feature} {forminput} {if $output.type == 'text'} @@ -133,7 +133,7 @@ {/foreach} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="registerprefs" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="registerprefs" value="{tr}Change preferences{/tr}" /> </div> {/form} {/jstab} @@ -145,7 +145,7 @@ <div class="control-group warning">{tr}If you turn on any secure login features you must set the HTTP and HTTPS server name.{/tr}</div> {foreach from=$httpSettings key=feature item=output} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$output.label for=$feature} {forminput} {if $output.type == 'text'} @@ -159,7 +159,7 @@ {/foreach} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="httpprefs" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="httpprefs" value="{tr}Change preferences{/tr}" /> </div> {/form} {/jstab} @@ -169,7 +169,7 @@ {form legend=$method.name} <input type="hidden" name="page" value="{$page}" /> {foreach from=$method.options item='output' key='op_id'} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$output.label for=$op_id} {forminput} {if $output.type == 'checkbox'} @@ -188,7 +188,7 @@ </div> {/foreach} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="auth_{$meth_name}" value="{tr}Change {$method.name} preferences{/tr}" /> + <input type="submit" class="ink-button" name="auth_{$meth_name}" value="{tr}Change {$method.name} preferences{/tr}" /> </div> {/form} {/jstab} diff --git a/templates/admin_permissions.tpl b/templates/admin_permissions.tpl index c5867e3..b07236f 100644 --- a/templates/admin_permissions.tpl +++ b/templates/admin_permissions.tpl @@ -53,7 +53,7 @@ {assign var=class value=""} {/if} - <td class="{if $group.group_id lt 4}alignright{else}aligncenter{/if} {$class}"> + <td class="{if $group.group_id lt 4}alignright{else}content-center{/if} {$class}"> <input id="{$p}{$group.group_id}" type="checkbox" value="{$p}" name="perms[{$group.group_id}][{$p}]" title="{$group.group_name}" {if $group.perms.$p}checked="checked"{/if}/> </td> @@ -70,7 +70,7 @@ <p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {booticon iname="icon-ok" iexplain="Default"}</p> <div class="submit"> - <input type="submit" class="btn btn-default" name="save" value="{tr}Apply Changes{/tr}" /> + <input type="submit" class="ink-button" name="save" value="{tr}Apply Changes{/tr}" /> </div> {/form} diff --git a/templates/admin_role_edit.tpl b/templates/admin_role_edit.tpl index 9f34b03..330e3f8 100644 --- a/templates/admin_role_edit.tpl +++ b/templates/admin_role_edit.tpl @@ -20,21 +20,21 @@ {jstab title="Edit Role"} {form legend="Add or Edit a Role"} <input type="hidden" name="role_id" value="{$roleInfo.role_id}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Role" for="roles_role"} {forminput} <input type="text" name="name" id="roles_role" size="30" maxlength="30" value="{$roleInfo.role_name}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Description" for="role_desc"} {forminput} <textarea rows="5" cols="20" name="desc" id="role_desc">{$roleInfo.role_desc}</textarea> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Role home page" for="role_home"} {forminput} <input type="text" name="home" id="role_home" value="{$roleInfo.role_home|escape}" /> @@ -48,13 +48,13 @@ {* {html_options name="dummy" id="content-list" values=$contentList options=$contentList onchange="document.getElementById('role_home').value=options[selectedIndex].value;"} <input type="text" size="30" name="find" value="{$smarty.request.find}" /> - <input type="submit" class="btn btn-default" value="{tr}Apply filter{/tr}" name="search_objects" /> + <input type="submit" class="ink-button" value="{tr}Apply filter{/tr}" name="search_objects" /> <br /> *} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="After registration page" for="after_registration_page"} {forminput} <input type="text" name="after_registration_page" id="after_registration_page" value="{$roleInfo.after_registration_page|escape}" /> @@ -62,21 +62,21 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" id="default_home" name="default_home_role" {if $roleInfo.role_id eq $defaultRoleId}checked="checked"{/if} value="y" />Default home page {formhelp note="This is the home page if a user belongs to many roles. Only one role may be the default home. If none is selected, users/my.php is the default."} </label> </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="is_default" value="y" {if $roleInfo.is_default eq 'y'}checked="checked"{/if} id="is_default" />Auto members {formhelp note="Users are automatically added to this role when registering at your site."} </label> </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="is_public" value="y" {if $roleInfo.is_public eq 'y'}checked="checked"{/if} id="is_public" />Is public {formhelp note="A user will be able to select this role at registration."} @@ -84,8 +84,8 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" /> - <input type="submit" class="btn btn-default" name="save" value="{tr}Save Role{/tr}" /> + <input type="submit" class="ink-button" name="cancel" value="{tr}Cancel{/tr}" /> + <input type="submit" class="ink-button" name="save" value="{tr}Save Role{/tr}" /> </div> {/form} {/jstab} @@ -97,7 +97,7 @@ <input type="hidden" name="package" value="{$smarty.request.package|escape}" /> <input type="hidden" name="perm_name[{$perms[user].perm_name}]" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Display permissions of package"} {forminput} {smartlink ititle="All packages" role_id=$roleInfo.role_id} @@ -109,7 +109,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <table class="table data"> <tr> <th> </th> @@ -131,7 +131,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="updateperms" value="{tr}Update{/tr}" /> + <input type="submit" class="ink-button" name="updateperms" value="{tr}Update{/tr}" /> </div> {/form} {/jstab} diff --git a/templates/admin_role_permissions.tpl b/templates/admin_role_permissions.tpl index 79cc544..076a6ec 100644 --- a/templates/admin_role_permissions.tpl +++ b/templates/admin_role_permissions.tpl @@ -53,7 +53,7 @@ {assign var=class value=""} {/if} - <td class="{if $role.role_id lt 4}alignright{else}aligncenter{/if} {$class}"> + <td class="{if $role.role_id lt 4}alignright{else}content-center{/if} {$class}"> <input id="{$p}{$role.role_id}" type="checkbox" value="{$p}" name="perms[{$role.role_id}][{$p}]" title="{$role.role_name}" {if $role.perms.$p}checked="checked"{/if}/> </td> @@ -70,7 +70,7 @@ <p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {booticon iname="icon-ok" iexplain="Default"}</p> <div class="submit"> - <input type="submit" class="btn btn-default" name="save" value="{tr}Apply Changes{/tr}" /> + <input type="submit" class="ink-button" name="save" value="{tr}Apply Changes{/tr}" /> </div> {/form} diff --git a/templates/admin_users.tpl b/templates/admin_users.tpl index 4a0dcfe..aff7d3d 100644 --- a/templates/admin_users.tpl +++ b/templates/admin_users.tpl @@ -1,6 +1,6 @@ {strip} {form legend="User Settings"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Display" for="users_display_name"} {forminput} <select name="settings[users_display_name]" id="users_display_name"> @@ -13,7 +13,7 @@ <input type="hidden" name="page" value="{$page}" /> {foreach from=$formFeatures key=feature item=output} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$output.label for=$feature} {forminput} {html_checkboxes name="settings[$feature]" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} @@ -22,7 +22,7 @@ </div> {/foreach} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Users Can Customize Their Layout" for="users_layouts"} {forminput} <select name="settings[users_layouts]" id="users_layouts"> @@ -33,7 +33,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Users Can Change Their Theme" for="users_themes"} {forminput} <select name="settings[users_themes]" id="users_themes"> @@ -45,7 +45,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Custom User Fields" for="custom_user_fields"} {forminput} <textarea name="settings[custom_user_fields]" id="custom_user_fields" cols="50" rows="2">{$gBitSystem->getConfig('custom_user_fields')}</textarea> @@ -55,7 +55,7 @@ <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="features" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="features" value="{tr}Change preferences{/tr}" /> </div> {/form} {/strip} diff --git a/templates/change_password.tpl b/templates/change_password.tpl index 7b8243e..2f9bff8 100644 --- a/templates/change_password.tpl +++ b/templates/change_password.tpl @@ -12,7 +12,7 @@ <input type="hidden" name="provpass" value="{$userInfo.provpass|escape}" /> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="User" for="user"} {forminput} {$userInfo.login} @@ -20,7 +20,7 @@ </div> {if !$userInfo.provpass} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Old Password" for="oldpass"} {forminput} <input type="password" name="oldpass" id="oldpass" /> @@ -28,14 +28,14 @@ </div> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="New Password" for="pass"} {forminput} <input type="password" name="pass" id="pass" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Again Please" for="pass2"} {forminput} <input type="password" name="pass2" id="pass2" /> @@ -43,7 +43,7 @@ </div> <div class="submit"> - <input type="submit" class="btn btn-default" name="change" value="{tr}Change Password{/tr}" /> + <input type="submit" class="ink-button" name="change" value="{tr}Change Password{/tr}" /> </div> {/form} </div><!-- end .body --> diff --git a/templates/edit_personal_page.tpl b/templates/edit_personal_page.tpl index c8a23aa..ee200ac 100644 --- a/templates/edit_personal_page.tpl +++ b/templates/edit_personal_page.tpl @@ -69,7 +69,7 @@ {legend legend="`$editLabel` Body"} <input type="hidden" name="page_id" value="{$pageInfo.page_id}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback warning=$errors.title} {formlabel label="$conDescr Title" for="title"} {forminput} @@ -82,7 +82,7 @@ </div> {if $gBitSystem->isFeatureActive( 'wiki_description' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Description" for="description"} {forminput} <input size="50" type="text" maxlength="200" name="description" id="description" value="{$pageInfo.description|escape:html}" /> @@ -98,7 +98,7 @@ {textarea edit=$pageInfo.data} {if $footnote} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Footnotes" for="footnote"} {forminput} <textarea name="footnote" id="footnote" rows="8" cols="50">{$footnote|escape}</textarea> @@ -108,7 +108,7 @@ {/if} {if $page ne 'SandBox'} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Comment" for="edit_comment"} {forminput} <input size="50" type="text" name="edit_comment" id="edit_comment" value="{$pageInfo.edit_comment}" /> @@ -118,7 +118,7 @@ {/if} {if $gBitUser->hasPermission( 'p_wiki_save_minor' )} - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="isminor" id="isminor" value="on" />Minor save {formhelp note="This will prevent the generation of a new version. You can use this, if your changes are minor."} @@ -146,30 +146,30 @@ {if $gBitSystem->isFeatureActive( 'wiki_copyrights' )} {jstab title="Copyright"} - <div class="control-group"> + <div class="control-group column-group gutters"> {legend legend="Copyright Settings" for="copyrightTitle"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Title" for="copyrightTitle"} {forminput} <input size="40" type="text" name="copyrightTitle" id="copyrightTitle" value="{$copyrightTitle|escape}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Authors" for="copyrightAuthors"} {forminput} <input size="40" type="text" name="copyrightAuthors" id="copyrightAuthors" value="{$copyrightAuthors|escape}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Year" for="copyrightYear"} {forminput} <input size="4" type="text" name="copyrightYear" id="copyrightYear" value="{$copyrightYear|escape}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="License"} {forminput} <a href="{$smarty.const.WIKI_PKG_URL}index.php?page={$wiki_license_page}">{tr}{$wiki_license_page}{/tr}</a> @@ -178,7 +178,7 @@ </div> {if $wiki_submit_notice neq ""} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Important"} {forminput} {$wiki_submit_notice} @@ -194,7 +194,7 @@ {if $gBitSystem->isFeatureActive( 'wiki_url_import' )} {jstab title="Import HMTL"} {legend legend="Import HMTL"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Import HTML from URL" for="suck_url"} {forminput} <input type="text" size="50" name="suck_url" id="suck_url" value="{$suck_url|escape}" /> @@ -202,7 +202,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="parsehtml" id="parsehtml" {if $parsehtml eq 'y'}checked="checked"{/if} />Try to convert HTML to wiki {formhelp note=""} @@ -210,7 +210,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="do_suck" value="{tr}Import{/tr}" /> + <input type="submit" class="ink-button" name="do_suck" value="{tr}Import{/tr}" /> </div> {/legend} {/jstab} @@ -218,8 +218,8 @@ {/jstabs} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="fCancel" value="{tr}Cancel{/tr}" /> - <input type="submit" class="btn btn-default" name="preview" value="{tr}Preview{/tr}" /> + <input type="submit" class="ink-button" name="fCancel" value="{tr}Cancel{/tr}" /> + <input type="submit" class="ink-button" name="preview" value="{tr}Preview{/tr}" /> <input type="submit" class="btn btn-primary" name="fSavePage" value="{tr}Save{/tr}" /> </div> diff --git a/templates/group_list_members.tpl b/templates/group_list_members.tpl index cf08b33..4fad987 100644 --- a/templates/group_list_members.tpl +++ b/templates/group_list_members.tpl @@ -14,29 +14,17 @@ <div class="body"> {formfeedback success=$successMsg error=$errorMsg} - <table class="table table-hover"> - <tr> - <th></th> - <th>{tr}Real Name{/tr}</th> - <th>{tr}Username{/tr}</th> - <th></th> - </tr> - {foreach name=groupMembers from=$groupMembers key=userId item=member} - <tr> - <td>{$smarty.foreach.groupMembers.iteration}</td> - <td>{displayname hash=$member}</td> - <td>{$member.login}</td> - <td>{if $member.user_id != $smarty.const.ANONYMOUS_USER_ID && $groupInfo.group_id != $smarty.const.ANONYMOUS_GROUP_ID} - <a class="icon" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&group_id={$groupInfo.group_id}&assign_user={$member.user_id}&tk={$gBitUser->mTicket}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove from group"}</a> + <ol class="data"> + {foreach from=$groupMembers key=userId item=member} + <li>{displayname hash=$member} + {if $member.user_id != $smarty.const.ANONYMOUS_USER_ID && $groupInfo.group_id != $smarty.const.ANONYMOUS_GROUP_ID} + <a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&group_id={$groupInfo.group_id}&assign_user={$member.user_id}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove from group"}</a> {/if} - </td> - </tr> + </li> {foreachelse} - <tr> - <td colspan="4">{tr}The group has no members.{/tr}</td> - </tr> + <li>{tr}The group has no members.{/tr}</li> {/foreach} - </table> + </ol> </div><!-- end .body --> </div> {/strip} diff --git a/templates/login.tpl b/templates/login.tpl index 71a8593..1609bc9 100644 --- a/templates/login.tpl +++ b/templates/login.tpl @@ -1,3 +1,5 @@ {strip} +<div class="display my"> {include file="bitpackage:users/login_inc.tpl"} +</div> {/strip} diff --git a/templates/login_inc.tpl b/templates/login_inc.tpl index d0ed698..47177fd 100644 --- a/templates/login_inc.tpl +++ b/templates/login_inc.tpl @@ -1,9 +1,9 @@ {strip} -{form class="col-md-6 col-xs-12 form-horizontal" name="login" legend="Please sign in to continue" ipackage=users ifile='validate.php' secure=$gBitSystem->isFeatureActive("site_https_login_required")} +{form class="form-horizontal span6" name="login" legend="Please sign in to continue" ipackage=users ifile='validate.php' secure=$gBitSystem->isFeatureActive("site_https_login_required")} {formfeedback error=$error} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Username or Email" for="user"} {forminput} <input type="text" name="user" id="user" size="25" /> @@ -13,7 +13,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Password" for="pass"} {forminput} <input type="password" name="pass" id="pass" size="25" /> @@ -24,7 +24,7 @@ </div> {if $gBitSystem->isFeatureActive('users_remember_me')} - <div class="control-group"> + <div class="control-group column-group gutters"> {forminput} <label class="checkbox"> <input type="checkbox" name="rme" id="rme" value="on" checked="checked" /> @@ -36,7 +36,7 @@ {if !$gBitSystem->getConfig('site_https_login_required') && $gBitSystem->isFeatureActive('http_login_url') or $gBitSystem->isFeatureActive('https_login_url')} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="" for=""} {forminput} <a href="{$gBitSystem->getConfig('http_login_url')}" title="{tr}Login using the default security protocol{/tr}">{tr}Standard{/tr}</a> | <a href="{$gBitSystem->getConfig('https_login_url')}" title="{tr}Login using a secure protocol{/tr}">{tr}Secure{/tr}</a> @@ -47,7 +47,7 @@ <div class="control-group submit"> {forminput} <input type="submit" class="btn btn-primary" name="login" value="{tr}Sign In{/tr}" /> - {if !$gBitSystem->isFeatureActive('site_https_login_required') && empty($smarty.server.HTTPS)} {booticon iname="icon-unlock" iexplain="Insecure" class="icon-large"}{/if} + {if $gBitSystem->isFeatureActive('site_https_login_required') || $smarty.server.HTTPS=='on'} {booticon iname="icon-lock" ipackage="icons" iexplain="Secure Login" class="icon-large"}{/if} {/forminput} </div> {/form} diff --git a/templates/menu_users.tpl b/templates/menu_users.tpl index 3d66ffa..c65bf91 100644 --- a/templates/menu_users.tpl +++ b/templates/menu_users.tpl @@ -3,7 +3,7 @@ {assign var=location value=menu} {/if} {if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if} -<ul class="dropdown-menu"> +<ul class="{$packageMenuClass}"> {if $gBitUser->isRegistered()} <li><a class="item" href="{$gBitSystem->getConfig('users_login_homepage',"`$smarty.const.USERS_PKG_URL`my.php")}">{booticon iname="icon-circle-arrow-right" iexplain="My Personal Page" ilocation=$location}</a></li> {if $gBitUser->hasPermission( 'p_users_view_user_homepage' )} @@ -13,7 +13,7 @@ <li><a class="item" href="{$smarty.const.USERS_PKG_URL}edit_personal_page.php">{booticon iname="icon-edit" iexplain="Edit My Homepage" ilocation=$location}</a></li> {/if} {if $gBitSystem->isFeatureActive( 'users_preferences' )} - <li><a class="item" href="{$smarty.const.USERS_PKG_URL}preferences.php">{booticon iname="icon-cogs" iexplain=Preferences ilocation=$location}</a></li> + <li><a class="item" href="{$smarty.const.USERS_PKG_URL}preferences.php">{booticon iname="icon-inbox" iexplain=Preferences ilocation=$location}</a></li> {/if} {if $gBitUser->hasPermission( 'p_users_create_personal_groups' )} <li><a class="item" href="{$smarty.const.USERS_PKG_URL}my_groups.php">{booticon iname="icon-group" iexplain="My Groups" ilocation=$location}</a></li> diff --git a/templates/my_bitweaver.tpl b/templates/my_bitweaver.tpl index 01b2902..18e3241 100644 --- a/templates/my_bitweaver.tpl +++ b/templates/my_bitweaver.tpl @@ -15,14 +15,14 @@ listing of submitted / edited stuff - similar to the old tiki personal tiki stuff. *} - <table class="width100p menutable"> + <table class="large-100 menutable"> <tr> {assign var="i" value="1"} {foreach key=key item=menu from=$gBitSystem->mAppMenu} {if $menu.menu_title && $menu.index_url && $menu.menu_template && !$menu.is_disabled} - <td style="width:33%;vertical-align:top;"> - <strong>{$menu.menu_title}</strong> - {include file=$menu.menu_template} + <td style="large-33;vertical-align:top;"> + <h1>{$menu.menu_title}</h1> + {include file=$menu.menu_template packageMenuClass="unstyled"} </td> {if not ($i++ mod 3)} </tr><tr> diff --git a/templates/my_group_edit.tpl b/templates/my_group_edit.tpl index f94885a..15a48e0 100644 --- a/templates/my_group_edit.tpl +++ b/templates/my_group_edit.tpl @@ -17,14 +17,14 @@ {jstab title="Edit Group"} {form legend="Add or Edit a Group"} <input type="hidden" name="group_id" value="{$groupInfo.group_id}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Group" for="groups_group"} {forminput} <input type="text" name="name" id="groups_group" value="{$groupInfo.group_name}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Description" for="group_desc"} {forminput} <textarea rows="5" cols="20" name="desc" id="group_desc">{$groupInfo.group_desc}</textarea> @@ -32,7 +32,7 @@ </div> {if $groups && $gBitUser->hasPermission( 'p_users_group_subgroups' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Include" for="groups_inc"} {forminput} <select name="include_groups[]" id="groups_inc" multiple="multiple" size="4"> @@ -48,8 +48,8 @@ {/if} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" /> - <input type="submit" class="btn btn-default" name="save" value="{tr}Save Group{/tr}" /> + <input type="submit" class="ink-button" name="cancel" value="{tr}Cancel{/tr}" /> + <input type="submit" class="ink-button" name="save" value="{tr}Save Group{/tr}" /> </div> {/form} {/jstab} @@ -68,7 +68,7 @@ {form legend="User Search"} <input type="hidden" name="group_id" value="{$groupInfo.group_id}" /> <input type="hidden" name="tab" value="members" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Username" for="username"} {forminput} <input type="text" id="username" name="find" value="{$find}"/> @@ -76,7 +76,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="submitUserSearch" value="Search"/> + <input type="submit" class="ink-button" name="submitUserSearch" value="Search"/> </div> {/form} </div> @@ -134,7 +134,7 @@ <input type="hidden" name="tab" value="assign" /> <input type="hidden" name="perm_name[{$perms[user].perm_name}]" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Display permissions of package"} {forminput} {smartlink ititle="All packages" group_id=$groupInfo.group_id} @@ -146,7 +146,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <table class="table data"> <tr> <th> </th> @@ -169,7 +169,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="updateperms" value="{tr}Update{/tr}" /> + <input type="submit" class="ink-button" name="updateperms" value="{tr}Update{/tr}" /> </div> {/form} {/jstab} diff --git a/templates/my_images.tpl b/templates/my_images.tpl index adc3017..df1aa02 100644 --- a/templates/my_images.tpl +++ b/templates/my_images.tpl @@ -14,12 +14,12 @@ {if $fHomepage} <input type="hidden" name="fHomepage" value="{$fHomepage}"/> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Self Portrait" for="user_portrait_file"} {if $gQueryUser->mInfo.portrait_attachment_id} {forminput} <img src="{$gQueryUser->mInfo.portrait_url}?{php}print time();{/php}" alt="{tr}self portrait{/tr}" /><br /> - <input type="submit" class="btn btn-default" value="{tr}delete self portrait{/tr}" name="delete_portrait" id="delete_portrait"/> + <input type="submit" class="ink-button" value="{tr}delete self portrait{/tr}" name="delete_portrait" id="delete_portrait"/> {/forminput} {/if} @@ -29,7 +29,7 @@ {/forminput} </div> - <div class="control-group" id="avatarfilerow"> + <div class="control-group column-group gutters" id="avatarfilerow"> {formlabel label="Upload Avatar" for="avatarfile"} {forminput} <input name="user_avatar_file" type="file" id="avatarfile" /> @@ -37,12 +37,12 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Avatar" for="user_auto_avatar"} {if $gQueryUser->mInfo.avatar_attachment_id} {forminput} <img src="{$gQueryUser->mInfo.avatar_url}?{php}print time();{/php}" alt="{tr}avatar{/tr}" /><br /> - <input type="submit" class="btn btn-default" value="{tr}delete avatar{/tr}" name="delete_avatar" /> + <input type="submit" class="ink-button" value="{tr}delete avatar{/tr}" name="delete_avatar" /> {/forminput} {/if} @@ -52,12 +52,12 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Logo" for="user_logo_file"} {if $gQueryUser->mInfo.logo_attachment_id} {forminput} <img src="{$gQueryUser->mInfo.logo_url}?{php}print time();{/php}" alt="{tr}logo{/tr}" /><br /> - <input type="submit" class="btn btn-default" value="{tr}delete logo{/tr}" id="delete_logo" name="delete_logo" /> + <input type="submit" class="ink-button" value="{tr}delete logo{/tr}" id="delete_logo" name="delete_logo" /> {/forminput} {/if} @@ -68,7 +68,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="store" value="{tr}Save Changes{/tr}" /> + <input type="submit" class="ink-button" name="store" value="{tr}Save Changes{/tr}" /> </div> {/form} </div><!-- end .body --> diff --git a/templates/my_role_edit.tpl b/templates/my_role_edit.tpl index c24e41a..bd21d9f 100644 --- a/templates/my_role_edit.tpl +++ b/templates/my_role_edit.tpl @@ -17,14 +17,14 @@ {jstab title="Edit Role"} {form legend="Add or Edit a Role"} <input type="hidden" name="role_id" value="{$roleInfo.role_id}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Role" for="roles_role"} {forminput} <input type="text" name="name" id="roles_role" value="{$roleInfo.role_name}" /> {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Description" for="role_desc"} {forminput} <textarea rows="5" cols="20" name="desc" id="role_desc">{$roleInfo.role_desc}</textarea> @@ -32,7 +32,7 @@ </div> {if $roles && $gBitUser->hasPermission( 'p_users_role_subroles' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Include" for="roles_inc"} {forminput} <select name="include_roles[]" id="roles_inc" multiple="multiple" size="4"> @@ -48,8 +48,8 @@ {/if} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" /> - <input type="submit" class="btn btn-default" name="save" value="{tr}Save Role{/tr}" /> + <input type="submit" class="ink-button" name="cancel" value="{tr}Cancel{/tr}" /> + <input type="submit" class="ink-button" name="save" value="{tr}Save Role{/tr}" /> </div> {/form} {/jstab} @@ -68,7 +68,7 @@ {form legend="User Search"} <input type="hidden" name="role_id" value="{$roleInfo.role_id}" /> <input type="hidden" name="tab" value="members" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Username" for="username"} {forminput} <input type="text" id="username" name="find" value="{$find}"/> @@ -76,7 +76,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="submitUserSearch" value="Search"/> + <input type="submit" class="ink-button" name="submitUserSearch" value="Search"/> </div> {/form} </div> @@ -134,7 +134,7 @@ <input type="hidden" name="tab" value="assign" /> <input type="hidden" name="perm_name[{$perms[user].perm_name}]" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Display permissions of package"} {forminput} {smartlink ititle="All packages" role_id=$roleInfo.role_id} @@ -146,7 +146,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <table class="table data"> <tr> <th> </th> @@ -169,7 +169,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="updateperms" value="{tr}Update{/tr}" /> + <input type="submit" class="ink-button" name="updateperms" value="{tr}Update{/tr}" /> </div> {/form} {/jstab} diff --git a/templates/register.tpl b/templates/register.tpl index 0249e7d..c9afdfe 100644 --- a/templates/register.tpl +++ b/templates/register.tpl @@ -3,7 +3,7 @@ {if $msg} <div class="alert alert-info">{$msg|escape}</div> {else} -{form class="col-md-6 col-xs-12 form-horizontal" action="`$smarty.const.USERS_PKG_URL`register.php" enctype="multipart/form-data" legend="Register as a new user" secure=$gBitSystem->isFeatureActive("site_https_login_required")} +{form action="`$smarty.const.USERS_PKG_URL`register.php" class="span6 form-horizontal" enctype="multipart/form-data" legend="Register as a new user" secure=$gBitSystem->isFeatureActive("site_https_login_required")} {foreach from=$reg.CUSTOM item='custom' key='custom_name'} <input type="hidden" name="CUSTOM[{$custom_name}]" value="{$custom}"/> {/foreach} @@ -12,7 +12,7 @@ {/foreach} {formfeedback error=$errors.create} {if $gBitSystem->isFeatureActive('users_register_passcode')} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.passcode} {formlabel label="Passcode to register" for="passcode"} {forminput} @@ -23,7 +23,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_real_name' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Your Name" for="real_name"} {forminput} <input type="text" name="real_name" id="real_name" value="{$smarty.request.real_name}" /> @@ -32,7 +32,7 @@ </div> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.login} {formlabel label="Username" for="login"} {forminput} @@ -59,7 +59,7 @@ {formfeedback warning="{tr}A confirmation email will be sent to you with instructions on how to login{/tr}"} {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.email} {formlabel label="Email" for="email"} {forminput} @@ -68,7 +68,7 @@ </div> {if !$gBitSystem->isFeatureActive( 'users_validate_user' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.password} {formlabel label="Password" for="pass"} {forminput} @@ -76,7 +76,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.password2} {formlabel label="Repeat password" for="password2"} {forminput} @@ -85,7 +85,7 @@ </div> {if $gBitSystem->isFeatureActive( 'user_password_generator' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="<a href=\"javascript:BitBase.genPass('genepass','pass1','pass2');\">{tr}Generate a password{/tr}</a>" for="email"} {forminput} <input id="genepass" type="text" /> @@ -95,7 +95,7 @@ {/if} {/if} {if $gBitUser->hasPermission( 'p_users_view_user_homepage' ) } - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="User information" for="users_information"} {forminput} <select name="users_information" id="users_information"> @@ -108,7 +108,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_real_name' ) or $gBitSystem->isFeatureActive( 'reg_homepage' ) or $gBitSystem->isFeatureActive( 'reg_country' ) or $gBitSystem->isFeatureActive( 'reg_language' ) or $gBitSystem->isFeatureActive( 'reg_portrait' )} {if $gBitSystem->isFeatureActive( 'reg_homepage' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="HomePage" for="users_homepage"} {forminput} <input size="50" type="text" name="prefs[users_homepage]" id="users_homepage" value="{$smarty.request.prefs.users_homepage}" /> @@ -118,7 +118,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_country' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Country" for="country"} {forminput} <select name="prefs[users_country]" id="country"> @@ -133,7 +133,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_language' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Language" for="language"} {forminput} <select name="prefs[bitlanguage]" id="language"> @@ -149,7 +149,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_portrait' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Self Portrait" for="user_portrait_file"} {forminput} <input name="user_portrait_file" id="user_portrait_file" type="file" /> @@ -160,7 +160,7 @@ {/if} {section name=f loop=$customFields} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$customFields[f]} {forminput} <input type="text" name="CUSTOM[{$customFields[f]|escape}]" value="{$smarty.request.CUSTOM.$customFields[f]}" /> @@ -170,7 +170,7 @@ {foreach from=$auth_reg_fields item='output' key='op_id'} {assign var=op_name value="auth[`$op_id`]"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$output.label for=$op_id} {forminput} {if $output.type == 'checkbox'} diff --git a/templates/remind_password.tpl b/templates/remind_password.tpl index 38546db..ef367df 100644 --- a/templates/remind_password.tpl +++ b/templates/remind_password.tpl @@ -16,7 +16,7 @@ {tr}Please follow the instructions in the email.{/tr} {else} {form legend="`$passVerb` my password"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback warning=$msg.error} {formlabel label="Username or email" for="username"} {forminput} @@ -25,7 +25,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="remind" id="remind" value="{tr}{$passVerb}{/tr} ({tr}password{/tr})" /> + <input type="submit" class="ink-button" name="remind" id="remind" value="{tr}{$passVerb}{/tr} ({tr}password{/tr})" /> </div> {/form} {/if} diff --git a/templates/role_register.tpl b/templates/role_register.tpl index 0dac68c..3c58dc2 100644 --- a/templates/role_register.tpl +++ b/templates/role_register.tpl @@ -22,7 +22,7 @@ <input type="hidden" name="password" value="{$reg.password}"/> <input type="hidden" name="novalidation" value="yes"/> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.validate} {formlabel label="Username" for="email"} {forminput} @@ -31,11 +31,11 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="register" value="{tr}register{/tr}" /> + <input type="submit" class="ink-button" name="register" value="{tr}register{/tr}" /> </div> {elseif $showmsg ne 'y'} {if $gBitSystem->isFeatureActive('users_register_passcode')} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.passcode} {formlabel label="Passcode to register" for="passcode"} {forminput} @@ -46,7 +46,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_real_name' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Your Name" for="real_name"} {forminput} <input type="text" name="real_name" id="real_name" value="{$smarty.request.real_name}" /> @@ -55,7 +55,7 @@ </div> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.login} {formlabel label="Username" for="login"} {forminput} @@ -82,7 +82,7 @@ {formfeedback warning="{tr}A confirmation email will be sent to you with instructions on how to login{/tr}"} {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.email} {formlabel label="Email" for="email"} {forminput} @@ -91,7 +91,7 @@ </div> {if !$gBitSystem->isFeatureActive( 'users_validate_user' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.password} {formlabel label="Password" for="pass"} {forminput} @@ -99,7 +99,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formfeedback error=$errors.password2} {formlabel label="Repeat password" for="password2"} {forminput} @@ -108,7 +108,7 @@ </div> {if $gBitSystem->isFeatureActive( 'user_password_generator' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="<a href=\"javascript:BitBase.genPass('genepass','pass1','pass2');\">{tr}Generate a password{/tr}</a>" for="email"} {forminput} <input id="genepass" type="text" /> @@ -119,7 +119,7 @@ {/if} {if $gBitUser->hasPermission( 'p_users_view_user_homepage' ) } {*For public sites, get user approval to display information*} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="User information" for="users_information"} {forminput} <select name="users_information" id="users_information"> @@ -132,7 +132,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_real_name' ) or $gBitSystem->isFeatureActive( 'reg_homepage' ) or $gBitSystem->isFeatureActive( 'reg_country' ) or $gBitSystem->isFeatureActive( 'reg_language' ) or $gBitSystem->isFeatureActive( 'reg_portrait' )} {if $gBitSystem->isFeatureActive( 'reg_homepage' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="HomePage" for="users_homepage"} {forminput} <input size="50" type="text" name="prefs[users_homepage]" id="users_homepage" value="{$smarty.request.prefs.users_homepage}" /> @@ -142,7 +142,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_country' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Country" for="country"} {forminput} <select name="prefs[users_country]" id="country"> @@ -157,7 +157,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_language' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Language" for="language"} {forminput} <select name="prefs[bitlanguage]" id="language"> @@ -173,7 +173,7 @@ {/if} {if $gBitSystem->isFeatureActive( 'reg_portrait' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Self Portrait" for="user_portrait_file"} {forminput} <input name="user_portrait_file" id="user_portrait_file" type="file" /> @@ -184,7 +184,7 @@ {/if} {section name=f loop=$customFields} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="$customFields[f]} {forminput} <input type="text" name="CUSTOM[{$customFields[f]|escape}]" value="{$smarty.request.CUSTOM.$customFields[f]}" /> @@ -194,7 +194,7 @@ {foreach from=$auth_reg_fields item='output' key='op_id'} {assign var=op_name value="auth[$op_id]"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$output.label for=$op_id} {forminput} {if $output.type == 'checkbox'} @@ -244,7 +244,7 @@ {/foreach} <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="register" value="{tr}Register{/tr}" /> + <input type="submit" class="ink-button" name="register" value="{tr}Register{/tr}" /> </div> {required legend=1} diff --git a/templates/signin.tpl b/templates/signin.tpl index 17a218e..ec30a76 100644 --- a/templates/signin.tpl +++ b/templates/signin.tpl @@ -1,8 +1,10 @@ {strip} <div class="row"> - {include file="bitpackage:users/login_inc.tpl"} - {if $gBitSystem->isFeatureActive( 'users_allow_register' )} + <div class="span6 display login "> + {include file="bitpackage:users/login_inc.tpl"} + </div> + <div class="span6 display login "> {include file="bitpackage:users/register.tpl"} - {/if} -</div> + </div> {/strip} +</div> diff --git a/templates/user_assigned_modules.tpl b/templates/user_assigned_modules.tpl index 28e8201..1296e33 100644 --- a/templates/user_assigned_modules.tpl +++ b/templates/user_assigned_modules.tpl @@ -59,7 +59,7 @@ {if $fEdit && $fAssign.name} <input type="hidden" name="assign_name" value="{$fAssign.name}" />{$assign.name} {else} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Module" for="module_rsrc"} {forminput} <select name="fAssign[module_rsrc]"> @@ -73,7 +73,7 @@ </div> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Position" for="pos"} {forminput} <select name="fAssign[pos]" id="pos"> @@ -84,7 +84,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Order" for="ord"} {forminput} <select name="fAssign[ord]" id="ord"> @@ -97,7 +97,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="fSubmitAssign" value="{tr}Add Module{/tr}" /> + <input type="submit" class="ink-button" name="fSubmitAssign" value="{tr}Add Module{/tr}" /> </div> {/form} {/jstab} @@ -106,7 +106,7 @@ {form legend="Assign center piece"} <input type="hidden" name="fAssign[pos]" value="c" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Center Piece" for="module"} {forminput} <select name="fAssign[module_rsrc]"> @@ -120,14 +120,14 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Position"} {forminput} {tr}Center{/tr} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Order" for="c_ord"} {forminput} <select name="fAssign[ord]" id="c_ord"> @@ -140,7 +140,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="fSubmitAssign" value="{tr}Add Module{/tr}" /> + <input type="submit" class="ink-button" name="fSubmitAssign" value="{tr}Add Module{/tr}" /> </div> {/form} {/jstab} @@ -149,7 +149,7 @@ {if $gBitUser->canCustomizeTheme()} {jstab title="Select Theme"} {form legend="Select Theme"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Theme" for="style"} {forminput} <select name="style" id="style"> @@ -166,7 +166,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" value="{tr}Apply Theme{/tr}" name="fSubmitSetTheme"> + <input type="submit" class="ink-button" value="{tr}Apply Theme{/tr}" name="fSubmitSetTheme"> </div> {/form} {/jstab} @@ -221,7 +221,7 @@ for instance, i don't know where the page heading stuff is used. </td> </tr> <tr class="panelsubmitrow"> - <td colspan="2"><input type="submit" class="btn btn-default" name="fSubmitAssign" value="{tr}assign{/tr}" /></td> + <td colspan="2"><input type="submit" class="ink-button" name="fSubmitAssign" value="{tr}assign{/tr}" /></td> </tr> </table> </form> @@ -261,7 +261,7 @@ for instance, i don't know where the page heading stuff is used. </td> </tr> <tr class="panelsubmitrow"> - <td colspan="2"><input type="submit" class="btn btn-default" name="fSubmitAssign" value="{tr}assign{/tr}" /></td> + <td colspan="2"><input type="submit" class="ink-button" name="fSubmitAssign" value="{tr}assign{/tr}" /></td> </tr> </table> </form> @@ -302,7 +302,7 @@ for instance, i don't know where the page heading stuff is used. </td> </tr> <tr class="panelsubmitrow"> - <td colspan="2"><input type="submit" class="btn btn-default" name="fSubmitAssign" value="{tr}assign{/tr}" /></td> + <td colspan="2"><input type="submit" class="ink-button" name="fSubmitAssign" value="{tr}assign{/tr}" /></td> </tr> </table> </form> @@ -324,7 +324,7 @@ for instance, i don't know where the page heading stuff is used. <td><textarea name="homeHeaderData" cols="50" rows="3">{$homeHeaderData}</textarea></td> </tr> <tr class="panelsubmitrow"> - <td><input type="submit" class="btn btn-default" name="fSubmitSetHeading" value="{tr}Set Heading{/tr}" /></td> + <td><input type="submit" class="ink-button" name="fSubmitSetHeading" value="{tr}Set Heading{/tr}" /></td> </tr> </table> </form> @@ -342,7 +342,7 @@ for instance, i don't know where the page heading stuff is used. {/section} </select> </td><td> - <input type="submit" class="btn btn-default" value="Change Theme" name="fSubmitSetTheme"> + <input type="submit" class="ink-button" value="Change Theme" name="fSubmitSetTheme"> </td></tr></table> </form> {/if} diff --git a/templates/user_favs_service_icon_inc.tpl b/templates/user_favs_service_icon_inc.tpl index 2229c63..c276227 100644 --- a/templates/user_favs_service_icon_inc.tpl +++ b/templates/user_favs_service_icon_inc.tpl @@ -1,32 +1,33 @@ {if $gContent && $gContent->isValid() && $gBitUser->isRegistered() && $gContent->hasService($smarty.const.CONTENT_SERVICE_USERS_FAVS) && $gBitThemes->isJavascriptEnabled()} {strip} -{if $fav.content_id eq $gContent->mContentId && $gBitUser->getFavorites($gContent->mContentId)} - {assign var=isFavorite value='true'} -{else} - {assign var=isFavorite value='false'} -{/if} -<a title="{if $isFavorite eq 'true'}{tr}Remove from your favorites{/tr}{else}{tr}Add to your favorites{/tr}{/if}" onclick="BitUser.toggleFavorite({$gContent->mContentId});" href="javascript:void(0); {* {$smarty.const.USERS_PKG_URL}bookmark.php?content_id={$gContent->mContentId} *}" > - {if $isFavorite eq 'true'} - {booticon iname="icon-heart-empty" ipackage="icons" iexplain="Remove Favorite"} +{assign var=isBookmarked value='false'} +{foreach from=$gBitUser->getFavorites() item=fav} + {if $fav.content_id eq $gContent->mContentId} + {assign var=isBookmarked value='true'} + {/if} +{/foreach} +<a title="{if $isBookmarked eq 'true'}{tr}Remove from your favorites{/tr}{else}{tr}Add to your favorites{/tr}{/if}" onclick="BitUser.toggleBookmark({$gContent->mContentId});" href="javascript:void(0); {* {$smarty.const.USERS_PKG_URL}bookmark.php?content_id={$gContent->mContentId} *}" > + {if $isBookmarked eq 'true'} + {booticon iname="icon-bookmark-empty" ipackage="icons" iexplain="Remove Bookmark"} {else} - {booticon iname="icon-heart" ipackage="icons" iexplain="Favorite"} + {booticon iname="icon-bookmark" ipackage="icons" iexplain="Bookmark"} {/if} </a> <script type="text/javascript">/* <![CDATA[ */ if( typeof( BitUser ) == 'undefined' ){ldelim} BitUser = {ldelim}{rdelim} {rdelim}; BitUser.bookmarkUrl = "{$smarty.const.USERS_PKG_URL}bookmark.php"; - BitUser.isFavorite = {$isFavorite}; + BitUser.isBookmarked = {$isBookmarked}; {literal} - BitUser.toggleFavorite = function( contentId ){ + BitUser.toggleBookmark = function( contentId ){ var ajax = new BitBase.SimpleAjax(); - var query = 'content_id='+contentId+'&action='+(BitUser.isFavorite?'remove':'add'); - ajax.connect( BitUser.bookmarkUrl, query, BitUser.postFavorite, "GET" ); + var query = 'content_id='+contentId+'&action='+(BitUser.isBookmarked?'remove':'add'); + ajax.connect( BitUser.bookmarkUrl, query, BitUser.postBookmark, "GET" ); }; - BitUser.postFavorite = function( rslt ){ + BitUser.postBookmark = function( rslt ){ var obj = eval( "(" + rslt.responseText + ")" ); switch( obj.Status.code ){ case 205: - BitUser.isFavorite = obj.Result.bookmark_state; + BitUser.isBookmarked = obj.Result.bookmark_state; case 400: case 401: default: diff --git a/templates/user_information_inc.tpl b/templates/user_information_inc.tpl index 5d8bdea..d4b07dd 100644 --- a/templates/user_information_inc.tpl +++ b/templates/user_information_inc.tpl @@ -1,7 +1,7 @@ {* $Header$ *} {strip} {if $userData->getPreference('users_information') eq 'public' or $gBitUser->mUserId eq $userData->mUserId} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Login"} {forminput} {if $gBitSystem->getConfig('users_display_name') eq 'login'}<strong>{/if} @@ -10,7 +10,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Real Name"} {forminput} {if $gBitSystem->getConfig('users_display_name') eq 'real_name'}<strong>{/if} @@ -20,14 +20,14 @@ </div> {if $userData->getPreference('users_country')} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Country"} {forminput} {biticon ipackage="users" ipath="flags/" iname=$userData->getPreference('flag') iexplain=$userData->getPreference('flag') iforce="icon"} {$userData->getPreference('users_country')} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Language"} {forminput} {assign var=langcode value=$userData->getPreference('bitlanguage')} @@ -37,7 +37,7 @@ {/if} {foreach from=$customFields key=i item=field} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$field} {forminput} {$userData->getPreference($field)} @@ -46,14 +46,14 @@ {/foreach} {if $gBitUser->hasPermission( 'p_users_admin' )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="User ID"} {forminput} {$userData->mInfo.user_id} {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Registered Email"} {forminput} {$userData->mInfo.email} @@ -62,7 +62,7 @@ {/if} {if $userData->mInfo.publicEmail} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Email Address"} {forminput} {$userData->mInfo.publicEmail} @@ -70,7 +70,7 @@ </div> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Member since"} {forminput} {$userData->mInfo.registration_date|bit_long_date} @@ -78,7 +78,7 @@ </div> {if $userData->mUserId ne $smarty.const.ANONYMOUS_USER_ID} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Last Login"} {forminput} {$userData->mInfo.last_login|bit_long_datetime} @@ -86,7 +86,7 @@ </div> {if $gBitSystem->isPackageActive( 'messages' ) and $userData->getPreference('messages_allow_messages') ne 'n' and $gBitUser->mUserId ne $userData->mUserId} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Send Message"} {forminput} {tr}Send a <a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$userInfo.login}">personal message</a> to this user{/tr} diff --git a/templates/user_preferences.tpl b/templates/user_preferences.tpl index 855b4c0..2c42b98 100644 --- a/templates/user_preferences.tpl +++ b/templates/user_preferences.tpl @@ -14,7 +14,7 @@ {legend legend="User Information"} <input type="hidden" name="view_user" value="{$editUser->mUserId}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Real Name" for="real_name"} {forminput} <input type="text" name="real_name" id="real_name" value="{$editUser->mInfo.real_name|escape}" /> @@ -24,7 +24,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Username"} {forminput} {if $gBitUser->hasPermission('p_users_admin')} @@ -38,7 +38,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Last login"} {forminput} {$editUser->mInfo.last_login|bit_long_datetime} @@ -46,7 +46,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Is email public?" for="users_email_display"} {forminput} <select name="users_email_display" id="users_email_display"> @@ -58,7 +58,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Country" for="country"} {forminput} <select name="users_country" id="country"> @@ -73,7 +73,7 @@ </div> {if $gBitSystem->isFeatureActive('users_change_language')} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Language" for="language"} {forminput} <select name="bitlanguage" id="bitlanguage"> @@ -89,7 +89,7 @@ {/if} {foreach from=$customFields key=i item=field} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label=$field} {forminput} <input type="text" name="CUSTOM[{$field}]" value="{$editUser->mPrefs.$field}" maxlength="250" /> @@ -97,7 +97,7 @@ </div> {/foreach} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="User information" for="users_information"} {forminput} <select name="users_information" id="users_information"> @@ -108,7 +108,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="HomePage" for="users_homepage"} {forminput} <input size="50" type="text" name="users_homepage" id="users_homepage" value="{$editUser->mInfo.users_homepage|escape|default:'http://'}" /> @@ -117,7 +117,7 @@ </div> {if $gBitSystem->getConfig('users_themes') == 'y'} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Theme" for="style"} {forminput} <select name="style" id="style"> @@ -130,7 +130,7 @@ </div> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Displayed time zone"} {forminput} <label><input type="radio" name="site_display_utc" value="UTC" {if $editUser->mPrefs.site_display_utc eq 'UTC'}checked="checked"{/if} />{tr}UTC{/tr}</label> @@ -146,7 +146,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="users_double_click" id="users_double_click" {if $editUser->mPrefs.users_double_click eq 'y'}checked="checked"{/if} />Use double-click to edit pages {formhelp note="Enabling this feature will allow you to double click on any wiki page and it will automatically take you to the edit page. Note that this does not work in all browsers."} @@ -154,7 +154,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="prefs" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="prefs" value="{tr}Change preferences{/tr}" /> </div> {/legend} {/form} @@ -162,7 +162,7 @@ <div> {form legend="Change your email address" secure=$gBitSystem->isFeatureActive("site_https_login_required")} <input type="hidden" name="view_user" value="{$editUser->mUserId}" /> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Email" for="email"} {forminput} <input size="50" type="text" name="email" id="email" value="{$editUser->mInfo.email|escape}" /> @@ -170,7 +170,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Password" for="pass"} {forminput} <input type="password" name="pass" id="pass" /> @@ -179,7 +179,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="chgemail" value="{tr}Change email{/tr}" /> + <input type="submit" class="ink-button" name="chgemail" value="{tr}Change email{/tr}" /> </div> {/form} </div> @@ -189,7 +189,7 @@ <input type="hidden" name="view_user" value="{$editUser->mUserId}" /> {* Users with admin priv can change password without knowing the old one *} {if !$view_user or ( !$gBitUser->hasPermission('p_users_admin') and $view_user )} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Old password" for="old"} {forminput} <input type="password" name="old" id="old" /> @@ -200,7 +200,7 @@ <input type="hidden" name="old" value="" /> {/if} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="New password" for="pass1"} {forminput} <input type="password" name="pass1" id="pass1" /> @@ -208,7 +208,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Again please" for="pass2"} {forminput} <input type="password" name="pass2" id="pass2" /> @@ -217,7 +217,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="chgpswd" value="{tr}Change Password{/tr}" /> + <input type="submit" class="ink-button" name="chgpswd" value="{tr}Change Password{/tr}" /> </div> {/form} </div> @@ -225,7 +225,7 @@ {* this should go in tidbits *} {if $gBitSystem->isFeatureActive( 'feature_tasks' )} {form legend="User Tasks"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Tasks per page" for="tasks_max_records"} {forminput} <select name="tasks_max_records" id="tasks_max_records"> @@ -241,7 +241,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="tasks_use_dates" id="tasks_use_dates" {if $tasks_use_dates eq 'y'}checked="checked"{/if} />Use dates {formhelp note=""} @@ -249,7 +249,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="tasksprefs" value="{tr}Change preferences{/tr}" /> + <input type="submit" class="ink-button" name="tasksprefs" value="{tr}Change preferences{/tr}" /> </div> {/form} {/if} @@ -257,7 +257,7 @@ {jstab title="Pictures"} {legend legend="Pictures and Icons"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Pictures"} {forminput} <a href="{$smarty.const.USERS_PKG_URL}my_images.php{if $editUser->mUserId ne $gBitUser->mUserId}?user_id={$editUser->mUserId}{/if}">{tr}Change pictures{/tr}</a> @@ -265,7 +265,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Avatar"} {forminput} {if $editUser->mInfo.avatar_url} @@ -275,7 +275,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Self Portrait"} {forminput} {if $editUser->mInfo.portrait_url} <img src="{$editUser->mInfo.portrait_url}" /> @@ -284,7 +284,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Logo" for=""} {forminput} {if $editUser->mInfo.logo_url} diff --git a/templates/user_theme.tpl b/templates/user_theme.tpl index 6f49797..ed2dd03 100644 --- a/templates/user_theme.tpl +++ b/templates/user_theme.tpl @@ -16,7 +16,7 @@ </p> {form legend="CSS File Data"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Load CSS File" for="reset"} {forminput} <select name="resetStyle"> @@ -29,22 +29,22 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="fResetCSS" id="reset" value="Reset CSS File" onclick="return confirm('{tr}Are you sure you want to reset your CSS back to the defaults? Any changes you have made will be lost.{/tr}');" /> + <input type="submit" class="ink-button" name="fResetCSS" id="reset" value="Reset CSS File" onclick="return confirm('{tr}Are you sure you want to reset your CSS back to the defaults? Any changes you have made will be lost.{/tr}');" /> </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <textarea name="textData" rows="42" cols="50">{$data|escape}</textarea> </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="fSaveCSS" value="Save" /> - <input type="submit" class="btn btn-default" name="fCancelCSS" value="Cancel" /> + <input type="submit" class="ink-button" name="fSaveCSS" value="Save" /> + <input type="submit" class="ink-button" name="fCancelCSS" value="Cancel" /> </div> {/form} {form enctype="multipart/form-data"} {legend legend="Upload new Image"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Upload Image" for="upload"} {forminput} <input type="hidden" name="MAX_FILE_SIZE" value="1024000" /> @@ -54,7 +54,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" value="Upload Image" name="fUpload" id="upload" /> + <input type="submit" class="ink-button" value="Upload Image" name="fUpload" id="upload" /> </div> {/legend} diff --git a/templates/user_watches.tpl b/templates/user_watches.tpl index 450161f..16225e7 100644 --- a/templates/user_watches.tpl +++ b/templates/user_watches.tpl @@ -7,7 +7,7 @@ <div class="body"> {form id='formi' legend="Content type selection"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="List content type" for="event"} {forminput} <select name="event" id="event" onchange="javascript:document.getElementById('formi').submit();"> diff --git a/templates/users_import.tpl b/templates/users_import.tpl index e891060..ffb1d99 100644 --- a/templates/users_import.tpl +++ b/templates/users_import.tpl @@ -29,7 +29,7 @@ {jstabs} {jstab title="Advanced"} {form legend="Batch user addition" enctype="multipart/form-data"} - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Batch upload (CSV file)" for="csvlist"} {forminput} <input type="file" name="csvlist" id="csvlist" /> @@ -37,7 +37,7 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> {formlabel label="Delimiter" for="delimiter"} {forminput} <input type="text" size="3" name="delimiter" id="delimiter" value="," /> @@ -45,28 +45,28 @@ {/forminput} </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="overwrite" id="overwrite" />Overwrite existing users {formhelp note=""} </label> </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="admin_verify_user" id="admin_verify_user" />Validate users by email {formhelp note="This will email the user a validation url with a temporary one time password. On validation the user is forced to choose a new password."} </label> </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="admin_verify_email" id="admin_verify_email" />Validate email address {formhelp note="This feature should be used only when you need the maximum security and should be used with discretion. If a visitor's email server is not responding, they will not be able to register. You also must have a valid sender email to use this feature."} </label> </div> - <div class="control-group"> + <div class="control-group column-group gutters"> <label class="checkbox"> <input type="checkbox" name="admin_noemail_user" id="admin_noemail_user" />Don't email imported users {formhelp note="If you for some reason don't want to email imported users the login and password, or validation url."} @@ -74,7 +74,7 @@ </div> <div class="control-group submit"> - <input type="submit" class="btn btn-default" name="batchimport" value="{tr}Import{/tr}" /> + <input type="submit" class="ink-button" name="batchimport" value="{tr}Import{/tr}" /> </div> {/form} {/jstab} diff --git a/templates/users_list.tpl b/templates/users_list.tpl index a111bba..8a597f0 100644 --- a/templates/users_list.tpl +++ b/templates/users_list.tpl @@ -3,50 +3,50 @@ {if $gBitUser->hasPermission( 'p_users_admin' )} <div class="width100p"> {form} - <div class="control-group floatleft clearnone width25p"> + <div class="control-group column-group gutters"> {formlabel label="Search"} {forminput} <input type="text" name="find" class="width90p" value="{$smarty.request.find}"/> {/forminput} {formhelp note="Full name, username, and email"} </div> - <div class="control-group floatleft clearnone width10p"> + <div class="control-group column-group gutters"> {formlabel label="# Results"} <input type="text" name="max_records" value="{$smarty.request.max_records}" style="width:3em"/> {formhelp note="Per page"} </div> - <div class="control-group floatleft clearnone width10p"> + <div class="control-group column-group gutters"> {formlabel label="Max Content"} <input type="text" name="max_content_count" value="{$smarty.request.max_content_count}" style="width:3em"/> {formhelp note="# objects created"} </div> - <div class="control-group floatleft clearnone width10p"> + <div class="control-group column-group gutters"> {formlabel label="Min Content"} <input type="text" name="min_content_count" value="{$smarty.request.min_content_count}" style="width:3em"/> {formhelp note="# objects created"} </div> {if $gBitSystem->isPackageActive('stats')} - <div class="control-group floatleft clearnone width20p"> + <div class="control-group column-group gutters"> {formlabel label="Registration Referer"} <input type="text" name="referer" value="{$smarty.request.referer}" class="width90p"/> {formhelp note="Enter partial URL or 'none'"} </div> {/if} - <div class="control-group floatleft clearnone width15p"> + <div class="control-group column-group gutters"> {formlabel label="IP"} <textarea rows="1" name="ip" style="height:15px">{$smarty.request.ip}</textarea> {formhelp note="Comma separated list"} </div> <div class="control-group submit"> - <input class="btn btn-xs" type="submit" name="search" value="{tr}Find{/tr}"> <input class="btn btn-xs" type="reset" name="reset" value="{tr}Reset{/tr}"> + <input class="btn btn-mini" type="submit" name="search" value="{tr}Find{/tr}"> <input class="btn btn-mini" type="reset" name="reset" value="{tr}Reset{/tr}"> </div> {/form} </div> {else} {minifind} {/if} -<nav class="clear"> - <ul class="inline navbar"> +<nav class="ink-navigation"> + <ul class="menu horizontal blue"> <li>{booticon iname="icon-circle-arrow-right" ipackage="icons" iexplain="sort by"}</li> <li>{smartlink iurl=$control.URL offset=$control.offset numrows=$control.numrows ititle="Username" isort="login"}</li> <li>{smartlink iurl=$control.URL offset=$control.offset numrows=$control.numrows ititle="Real name" isort="real_name"}</li> @@ -60,13 +60,13 @@ {form id=checkform action=$smarty.server.REQUEST_URI} <ul class="clear data inline userslist media-grid" start="{$listInfo.offset+1}"> {foreach from=$users item=userHash key=userId} - <li class="item {cycle values='even,odd'} pull-left" style="width:31%;padding:0 0 0 1%;background:url('{$userHash.thumbnail_url|default:"`$smarty.const.USERS_PKG_URL`icons/silhouette_100.png"|escape}') no-repeat scroll top right transparent;"> + <li class="item {cycle values='even,odd'} pull-left large-30" style="width:31%;padding:0 0 0 1%;background:url('{$userHash.thumbnail_url|default:"`$smarty.const.USERS_PKG_URL`icons/silhouette_100.png"|escape}') no-repeat scroll top right transparent;"> {if $gBitUser->hasPermission( 'p_users_admin' )} <label class="checkbox"> <input type="checkbox" name="batch_user_ids[]" value="{$userHash.user_id}" /> <small>{$listInfo.offset+$userHash@iteration}.</small> <strong>{$userHash.real_name|default:$userHash.login|escape}</strong> </label> - <div><a href="/{$userHash.login}">{$userHash.login}</a></div> + <div>{$userHash.login}</div> {else} <h4>{displayname hash=$userHash}</h4> {/if} @@ -94,7 +94,7 @@ {else} {smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userHash.user_id ititle="Assign Role" booticon="icon-key" iforce=icon} {/if} - {smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userHash.user_id ititle="User Activity" booticon="icon-bolt" iforce="icon"} + {smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userHash.user_id ititle="User Activity" booticon="icon-lightbulb" iforce="icon"} {if $userHash.user_id != $smarty.const.ANONYMOUS_USER_ID && $userHash.user_id != $smarty.const.ROOT_USER_ID && $userHash.user_id != $gBitUser->mUserId} {if $userHash.content_status_id > 0} {smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=ban ititle="Ban User" booticon="icon-minus-sign" iforce=icon} @@ -133,7 +133,7 @@ </select> <noscript> - <div><input type="submit" class="btn btn-default" value="{tr}Submit{/tr}" /></div> + <div><input type="submit" class="ink-button" value="{tr}Submit{/tr}" /></div> </noscript> </div> {/if} |