changed desktop modules now using font-awesome instead of noun project fonts

This commit is contained in:
Rushabh Mehta 2012-12-21 18:27:40 +05:30
parent 380d7c6a53
commit d3c9fb6b3b
9 changed files with 22 additions and 4 deletions

View File

@ -1,5 +1,7 @@
wn.pages['activity'].onload = function(wrapper) { wn.pages['activity'].onload = function(wrapper) {
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe')); 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'); wrapper.appframe.title('Activity');
var list = new wn.ui.Listing({ var list = new wn.ui.Listing({

View File

@ -2,6 +2,7 @@ erpnext.updates = [
["21st December 2012", [ ["21st December 2012", [
"Manufacturing: For Material Transfer against Production Order, \ "Manufacturing: For Material Transfer against Production Order, \
fetch quantity pending to be transferred for each item." fetch quantity pending to be transferred for each item."
"Desktop: New Icons and now sortable by dragging."
]], ]],
["20th December 2012", [ ["20th December 2012", [
"Website: Create Product Search Page, Product Group Page on the website.", "Website: Create Product Search Page, Product Group Page on the website.",

View File

@ -47,7 +47,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
} else { } else {
cur_frm.set_intro("This Leave Application is pending approval. Only the Leave Apporver can update status.") cur_frm.set_intro("This Leave Application is pending approval. Only the Leave Apporver can update status.")
cur_frm.toggle_enable("status", false); cur_frm.toggle_enable("status", false);
if(!doc.__islocal) cur_frm.frm_head.appframe.buttons.Submit.toggle(false); if(!doc.__islocal) cur_frm.frm_head.appframe.buttons.Submit.remove();
} }
} else { } else {
if(doc.status=="Approved") { if(doc.status=="Approved") {

View File

@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
wn.home_page = "desktop";
$.extend(wn.modules, { $.extend(wn.modules, {
"Selling": { "Selling": {
link: "selling-home", link: "selling-home",
@ -62,7 +63,7 @@ $.extend(wn.modules, {
icon: "icon-group" icon: "icon-group"
}, },
"Setup": { "Setup": {
link: "hr-home", link: "Setup",
color: "#484848", color: "#484848",
icon: "icon-wrench" icon: "icon-wrench"
}, },
@ -102,6 +103,8 @@ erpnext.module_page.setup_page = function(module, wrapper) {
$(wrapper).find("a[title]").tooltip({ $(wrapper).find("a[title]").tooltip({
delay: { show: 500, hide: 100 } delay: { show: 500, hide: 100 }
}); });
wrapper.appframe.add_home_breadcrumb();
wrapper.appframe.add_breadcrumb(wn.modules[module].icon);
} }
// hide list links where the user does // hide list links where the user does

View File

@ -15,7 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
pscript.onload_Setup = function(wrapper) { pscript.onload_Setup = function(wrapper) {
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'), 'Setup'); wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'), 'Setup');
wrapper.appframe.add_home_breadcrumb();
wrapper.appframe.add_breadcrumb(wn.modules["Setup"].icon);
erpnext.module_page.hide_links(wrapper); erpnext.module_page.hide_links(wrapper);
if(wn.boot.expires_on) { if(wn.boot.expires_on) {
$(wrapper).find(".layout-main") $(wrapper).find(".layout-main")

View File

@ -31,6 +31,9 @@ wn.pages.messages.onload = function(wrapper) {
<div><button class="btn">Post</button></div><hr>\ <div><button class="btn">Post</button></div><hr>\
</div>\ </div>\
<div class="all-messages"></div>').appendTo($(wrapper).find('.layout-main-section')); <div class="all-messages"></div>').appendTo($(wrapper).find('.layout-main-section'));
wrapper.appframe.add_home_breadcrumb();
wrapper.appframe.add_breadcrumb(wn.modules["Messages"].icon);
erpnext.messages = new erpnext.Messages(wrapper); erpnext.messages = new erpnext.Messages(wrapper);
erpnext.toolbar.set_new_comments(0); erpnext.toolbar.set_new_comments(0);

View File

@ -17,7 +17,9 @@
pscript['onload_question-view'] = function(wrapper) { pscript['onload_question-view'] = function(wrapper) {
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe')); wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe'));
wrapper.appframe.title('Question'); wrapper.appframe.title('Question');
wrapper.appframe.add_module_tab('Knowledge Base'); wrapper.appframe.add_home_breadcrumb();
wrapper.appframe.add_module_breadcrumb("Knowledge Base");
wrapper.appframe.add_breadcrumb("icon-file");
wrapper.add_answer_area = $('.add-answer-area').get(0); wrapper.add_answer_area = $('.add-answer-area').get(0);
} }

View File

@ -18,6 +18,8 @@ pscript.onload_questions = function(wrapper) {
body = $(wrapper).find('.layout-main-section').get(0); body = $(wrapper).find('.layout-main-section').get(0);
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe')); wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe'));
wrapper.appframe.add_home_breadcrumb();
wrapper.appframe.add_breadcrumb(wn.modules["Knowledge Base"].icon);
wrapper.appframe.title('Knowledge Base'); wrapper.appframe.title('Knowledge Base');
// kb // kb

View File

@ -185,6 +185,8 @@ erpnext.todo.save = function(btn) {
wn.pages.todo.onload = function(wrapper) { wn.pages.todo.onload = function(wrapper) {
// create app frame // create app frame
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'), 'To Do'); wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'), 'To Do');
wrapper.appframe.add_home_breadcrumb();
wrapper.appframe.add_breadcrumb(wn.modules["To Do"].icon);
wrapper.appframe.add_button('Refresh', erpnext.todo.refresh, 'icon-refresh'); wrapper.appframe.add_button('Refresh', erpnext.todo.refresh, 'icon-refresh');
wrapper.appframe.add_button('Add', function() { wrapper.appframe.add_button('Add', function() {
erpnext.todo.make_dialog({ erpnext.todo.make_dialog({