Compare commits

...

4 Commits

Author SHA1 Message Date
87387a54f2 Merge branch 'dev' into feature/12-user-management 2021-01-14 18:30:08 +01:00
b34e3aeed0 👀 UsersOverview - disable advanced search
ref #12
2021-01-14 18:24:37 +01:00
86c54e04a8 🙋‍♂️ UserDetail - active/inactive user state edit
ref #12
2021-01-14 18:22:09 +01:00
ef9fc596f5 🙋‍♂️ UserDetail - disable profile picture edit
ref #12
2021-01-14 18:21:48 +01:00
2 changed files with 17 additions and 15 deletions

View File

@@ -171,18 +171,24 @@
{/if} {/if}
</span> </span>
</div> </div>
<div class="mt-2 flex items-center"> <div class="mt-3 text-sm w-full">
<p
class="ml-1 font-medium text-gray-700">Profile Picture</p>
<img <img
alt={$_('profile-picture')} alt={$_('profile-picture')}
class="inline-block h-20 w-20 rounded-full overflow-hidden bg-gray-100" class="h-20 w-20 rounded-full overflow-hidden bg-gray-100"
src={editable_userdata.profilePic} /> src={editable_userdata.profilePic} />
<button <!-- <button
type="button" type="button"
class="ml-5 bg-white py-2 px-3 border border-gray-300 rounded-md shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">Change</button> class="ml-5 bg-white py-2 px-3 border border-gray-300 rounded-md shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">Change</button> -->
</div> </div>
<!-- --> <!-- -->
<div class="mt-3 text-sm w-full"> <div class="mt-3 text-sm w-full">
<input <label
for="enabled"
class="ml-1 font-medium text-gray-700">Active?</label>
<br>
<p class="text-gray-500"> <input
id="enabled" id="enabled"
on:change={() => { on:change={() => {
editable_userdata.enabled = !editable_userdata.enabled; editable_userdata.enabled = !editable_userdata.enabled;
@@ -191,11 +197,7 @@
name="enabled" name="enabled"
type="checkbox" type="checkbox"
checked={editable_userdata.enabled} checked={editable_userdata.enabled}
class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" /> class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" /> set the user active/ inactive</p>
<label
for="enabled"
class="ml-1 font-medium text-gray-700">Active?</label>
<p class="text-gray-500">set the user active/ inactive</p>
</div> </div>
<div class="text-sm w-full"> <div class="text-sm w-full">
<label <label

View File

@@ -33,17 +33,17 @@
{#if current_users.length === 0} {#if current_users.length === 0}
<UsersEmptyState /> <UsersEmptyState />
{:else} {:else}
{#if advanced_search} <!-- {#if advanced_search}
advanced search advanced search
{:else} {:else} -->
<input <input
type="search" type="search"
bind:value={searchvalue} bind:value={searchvalue}
placeholder={$_('datatable.search')} placeholder={$_('datatable.search')}
aria-label={$_('datatable.search')} aria-label={$_('datatable.search')}
class="gridjs-input gridjs-search-input mb-4" /> class="gridjs-input gridjs-search-input mb-4" />
{/if} <!-- {/if} -->
<button <!-- <button
on:click={() => { on:click={() => {
advanced_search = !advanced_search; advanced_search = !advanced_search;
}} }}
@@ -52,7 +52,7 @@
{#if advanced_search} {#if advanced_search}
toggle simple search toggle simple search
{:else}toggle advanced search{/if} {:else}toggle advanced search{/if}
</button> </button> -->
<div <div
class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll"> class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
<table class="divide-y divide-gray-200 w-full"> <table class="divide-y divide-gray-200 w-full">