diff --git a/Bootstrap.Admin/Content/css/tasks.css b/Bootstrap.Admin/Content/css/tasks.css index 4df239f6..c9e06a3d 100644 --- a/Bootstrap.Admin/Content/css/tasks.css +++ b/Bootstrap.Admin/Content/css/tasks.css @@ -1,5 +1,4 @@ /*--------------Tasks Widget--------------*/ - .task-content { margin-bottom: 30px; } @@ -30,7 +29,6 @@ .tasks-widget .task-list > li { position: relative; - border-bottom: 1px dashed #eaeaea; font-size: 12px; } @@ -56,7 +54,7 @@ position: absolute; left: 190px; right: 40px; - top: 17px; + top: 15px; display: inline-block; } @@ -80,7 +78,7 @@ } .tasks-widget .task-list li > .task-title .hidden-phone { - padding-top: 14px; + padding-top: 12px; margin-right: 4px; } @@ -112,15 +110,14 @@ .tasks-widget .task-list li .task-title.notifi .task-time { position: absolute; right: 66px; - top: 17px; + top: 15px; display: inline-block; - color: #3c763d; } .tasks-widget .task-list li .task-title .task-title-sp { margin-right: 5px; max-width: 150px; - padding-top: 17px; + padding-top: 15px; } .tasks-widget .task-list li.task-done .task-title-sp { @@ -152,7 +149,7 @@ .tasks-widget .task-list li i { position: absolute; left: 6px; - padding: 19px 10px; + padding: 17px 10px; cursor: pointer; } @@ -229,6 +226,19 @@ border-left: 3px solid #b7d8e2; } +.task-header { + font-size: 14px !important; + font-weight: 600; + background-color: #5cb85c !important; + color: #fff; + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} + +.task-oper { + padding-top: 15px; + padding-right: 20px; +} @media (max-width: 548px) { .tasks-widget .task-list li .task-title.notifi .task-value { diff --git a/Bootstrap.Admin/Scripts/noti.js b/Bootstrap.Admin/Scripts/noti.js index a0a46114..cf2e9768 100644 --- a/Bootstrap.Admin/Scripts/noti.js +++ b/Bootstrap.Admin/Scripts/noti.js @@ -1,17 +1,21 @@ $(function () { var $btnRefreshUser = $('#refreshUsers'); - var htmlNewUsers = '
  • {0}{1}{2}
  • '; + var htmlNewUsersHeader = '
  • 登陆名称显示名称/备注注册时间
    操作
  • '; + var htmlNewUsers = '
  • {0}{4}:{1}{2}
  • '; function listData() { $btnRefreshUser.toggleClass('fa-spin'); + var $taskUsers = $('#tasks-users'); + $taskUsers.html(htmlNewUsersHeader); $.bc({ Id: 'newusers', url: Notifications.url, method: 'GET', swal: false, callback: function (result) { if (result) { var content = result.Users.map(function (noti) { - return $.format(htmlNewUsers, noti.UserName, noti.Description, noti.RegisterTime, noti.ID); + return $.format(htmlNewUsers, noti.UserName, noti.Description, noti.RegisterTime, noti.ID, noti.DisplayName); }).join(''); - $('#tasks-users').html(content); + $taskUsers.append(content); + if (!$.browser.versions.mobile) $('#tasks-users').find('.tipso_style').tipso({ position: 'top', width: 100 }); } $btnRefreshUser.toggleClass('fa-spin'); } @@ -22,6 +26,7 @@ $btnRefreshUser.on('click', function () { listData(); }); + if (!$.browser.versions.mobile) $btnRefreshUser.tipso({ position: 'left', width: 100 }); $('#tasks-users').on('click', 'button', function () { var id = $(this).attr('data-id'); diff --git a/Bootstrap.Admin/Views/Admin/Notifications.cshtml b/Bootstrap.Admin/Views/Admin/Notifications.cshtml index 2d10a432..ad4c9fc8 100644 --- a/Bootstrap.Admin/Views/Admin/Notifications.cshtml +++ b/Bootstrap.Admin/Views/Admin/Notifications.cshtml @@ -18,7 +18,7 @@ @Html.Partial("Navigator", Model) }
    -
    用户注册
    +
    用户注册