[ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9

This commit is contained in:
Rushabh Mehta
2013-05-23 16:03:49 +05:30
parent 4a2f0f8c36
commit b394a25904
7 changed files with 67 additions and 59 deletions

View File

@@ -1,20 +1,20 @@
#activity-list .label {
#page-activity .label {
display: inline-block;
width: 100px;
margin-right: 7px;
}
#activity-list .label-info {
#page-activity .label-info {
cursor: pointer;
}
#activity-list .user-info {
#page-activity .user-info {
float: right;
color: #777;
font-size: 10px;
}
#activity-list .date-sep {
#page-activity .date-sep {
margin-bottom: 11px;
padding: 5px 0px;
border-bottom: 1px solid #aaa;

View File

@@ -1,7 +0,0 @@
<div class="appframe col col-lg-12">
<div class="layout-appframe"></div>
<div class="layout-main">
<div id="activity-list">
</div>
</div>
</div>

View File

@@ -1,13 +1,15 @@
wn.pages['activity'].onload = function(wrapper) {
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe'));
wrapper.appframe.add_home_breadcrumb();
wrapper.appframe.add_breadcrumb(wn.modules["Activity"].icon);
wrapper.appframe.title('Activity');
wn.ui.make_app_page({
parent: wrapper,
title: "Activity",
single_column: true
})
wrapper.appframe.add_module_icon("Activity");
var list = new wn.ui.Listing({
appframe: wrapper.appframe,
method: 'home.page.activity.activity.get_feed',
parent: $('#activity-list'),
parent: $(wrapper).find(".layout-main"),
render_row: function(row, data) {
new erpnext.ActivityFeed(row, data);
}