From df179b7573c4ae8fad01a453999942d08788be95 Mon Sep 17 00:00:00 2001 From: Ricsi Date: Thu, 9 Mar 2017 20:09:55 +0100 Subject: [PATCH] user list updated --- _css/default.css | 31 +++++++++++++- template/templates/user_data_edit.tpl | 1 - template/templates/user_list.tpl | 58 +++++++++++++++++++-------- 3 files changed, 71 insertions(+), 19 deletions(-) diff --git a/_css/default.css b/_css/default.css index c0bfc66..29823ce 100644 --- a/_css/default.css +++ b/_css/default.css @@ -230,7 +230,7 @@ td.create a { background-color: #B7B7B7; } -.list .list_item img, .list .name_tag img, .list .name_tag_checked img{ +.list .list_item img, .list .name_tag img, .list .name_tag_checked img, .active_kid img{ width: 20px; height: 20px; float: left; @@ -384,13 +384,40 @@ table.log tr.delete:hover { .kid_menu { display: none; - padding: 3px 0px; background-color: #B7B7B7; border-left: 2px solid #000; position: relative; top: -4px; } +.active_kid { + background-color: #333; + color: #fff; + font-weight: bold; + border-left: 2px solid #000; + vertical-align: middle; + font-size: 18px; + font-family: Arial; + margin: 4px 0px; + padding: 5px; + +} + +.kid_menu .kid_submenu { + text-align: center; + cursor: pointer; + border-bottom: 1px dotted black; + padding: 2px 0px; +} + +.kid_menu .kid_submenu:hover { + background-color: #7b7575; +} + +.kid_menu .kid_submenu:hover span { + color: #e9e2e1; +} + .kid_menu .add_money_deposit { width: 46%; text-align: center; diff --git a/template/templates/user_data_edit.tpl b/template/templates/user_data_edit.tpl index d71fade..cd7ece6 100755 --- a/template/templates/user_data_edit.tpl +++ b/template/templates/user_data_edit.tpl @@ -1,7 +1,6 @@
diff --git a/template/templates/user_list.tpl b/template/templates/user_list.tpl index ea6eaab..49d0128 100755 --- a/template/templates/user_list.tpl +++ b/template/templates/user_list.tpl @@ -45,13 +45,35 @@ $("#uk_filter_name").keyup(function() { function open_kid_menu(uk_id) { - $("#kid_menu_"+uk_id).fadeToggle(); + $("#kid_menu_"+uk_id).slideToggle(); + console.log($(this)); + if (!$("#kid_"+uk_id).hasClass('active_kid')) { + $("#kid_"+uk_id).addClass('active_kid'); + $("#kid_"+uk_id).removeClass('list_item'); + } + else { + $("#kid_"+uk_id).removeClass('active_kid'); + $("#kid_"+uk_id).addClass('list_item'); + } + } function open_deposit(user_id) { $("#"+user_id).submit(); } +function open_preview(user_id) { + window.open("/preview/diary/"+user_id, '_blank'); +} + +function open_datasheet(user_id) { + location.href = "/admin/members/"+user_id; +} + +function open_previous_deposits(user_id) { + location.href = "/admin/view_deposit/"+user_id; +} + function search() { document.getElementById('user_list').innerHTML = 'Betöltés...'; $("#is_active").prop("disabled",true); @@ -68,27 +90,31 @@ function search() { //console.log(pdata[i]['uk_id']); //add_list_item(pdata[i]['uk_id'],pdata[i]['uk_name']); content += - '\ -
\ - \ - '+pdata[i]['uk_name']+'\ -
\ -
\ + '\ \ -
\ \
\ +
\ + \ + '+pdata[i]['uk_name']+'\ +
\
\ -
\ - Befizetés\ +
\ + Adatlap\ + \ +
\ +
\ + Új befizetés\ \
\ - \ -
\ - Szülői előnézet\ - \ -
\ -
\ +
\ + Korábbi befizetések\ + \ +
\ +
\ + Szülői előnézet\ + \ +
\
\ ' }