vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'responsive' of github.com:webnotes/wnframework into responsive

Browse source
This commit is contained in:
Rushabh Mehta 2013-06-14 11:33:30 +05:30
commit 763ea3101c
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/page/update_manager/update_manager.js
View file

@ -46,7 +46,7 @@ wn.UpdateThisApp = Class.extend({
me.wrapper.update_output.toggle(false);
me.wrapper.progress_bar.empty().toggle(true);
this.wrapper.progress_bar.html('<div class="progress progress-striped active"> \
<div class="bar" style="width: 100%;"></div> \
<div class="progress-bar progress-bar-info" style="width: 100%;"></div> \
</div> \
<div>' + wn._("Update is in progress. This may take some time.") + '</div>');

2
public/js/wn/ui/messages.js
View file

@ -5,7 +5,7 @@ wn.messages.waiting = function(parent, msg, bar_percent) {
return $(repl('<div class="well" style="width: 63%; margin: 30px auto;">\
<p style="text-align: center;">%(msg)s</p>\
<div class="progress progress-striped active">\
<div class="bar" style="width: %(bar_percent)s%"></div></div>', {
<div class="progress-bar progress-bar-info" style="width: %(bar_percent)s%"></div></div>', {
bar_percent: bar_percent,
msg: msg
}))

4
webnotes/utils/__init__.py
View file

@ -787,6 +787,10 @@ def comma_sep(some_list, sep):
else:
return some_list
def filter_strip_join(some_list, sep):
"""given a list, filter None values, strip spaces and join"""
return (cstr(sep)).join((cstr(a).strip() for a in filter(None, some_list)))
def get_path(*path):
import os
return os.path.join(get_base_path(), *path)