瀏覽代碼

updated paths

version-14
Rushabh Mehta 13 年之前
父節點
當前提交
f486cad30c
共有 17 個檔案被更改,包括 47 行新增143 行删除
  1. +2
    -2
      public/css/bootstrap/icons.css
  2. +0
    -6
      public/css/legacy/body.css
  3. +10
    -10
      public/css/ui/fonts.css
  4. +0
    -82
      public/css/ui/overlay.css
  5. +0
    -12
      public/css/ui/status_bar.css
  6. +1
    -1
      public/js/legacy/utils/dom.js
  7. +13
    -13
      public/js/lib/Aristo/aristo.selected.css
  8. +4
    -4
      public/js/lib/jQuery.Gantt/css/style.css
  9. +1
    -1
      public/js/wn/dom.js
  10. +1
    -1
      public/js/wn/misc/user.js
  11. +1
    -1
      public/js/wn/ui/button.js
  12. +1
    -1
      public/js/wn/ui/listing.js
  13. +1
    -1
      public/js/wn/ui/toolbar/toolbar.js
  14. +1
    -1
      webnotes/boot.py
  15. +1
    -1
      webnotes/model/doctype.py
  16. +2
    -2
      webnotes/utils/bundlejs.py
  17. +8
    -4
      wnf.py

+ 2
- 2
public/css/bootstrap/icons.css 查看文件

@@ -6,7 +6,7 @@
*margin-right: .3em;
line-height: 14px;
vertical-align: text-top;
background-image: url("../images/lib/icons/glyphicons-halflings.png");
background-image: url("../lib/images/icons/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
}
@@ -17,7 +17,7 @@
}

.icon-white {
background-image: url("../images/lib/icons/glyphicons-halflings-white.png");
background-image: url("../lib/images/icons/glyphicons-halflings-white.png");
}

.icon-glass {


+ 0
- 6
public/css/legacy/body.css 查看文件

@@ -335,12 +335,6 @@ div.std-footer-item {
}

.erpnext-logo {
position: fixed;
bottom: 5px;
left: 5px;
height: 30px;
width: 30px;
background: url('../images/erpnext-fade.png') no-repeat top left;
}

.markdown p {


+ 10
- 10
public/css/ui/fonts.css 查看文件

@@ -2,68 +2,68 @@
font-family: 'Pontano Sans';
font-style: normal;
font-weight: 800;
src: url('fonts/pontanosans.woff') format('woff');
src: url('../lib/css/fonts/pontanosans.woff') format('woff');
}

@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-weight: normal;
src: local('Droid Sans'), local('DroidSans'), url('fonts/droidsans.woff') format('woff');
src: local('Droid Sans'), local('DroidSans'), url('../lib/css/fonts/droidsans.woff') format('woff');
}

@font-face {
font-family: 'PT Sans';
font-style: normal;
font-weight: normal;
src: local('PT Sans'), local('PTSans-Regular'), url('fonts/ptsans.woff') format('woff');
src: local('PT Sans'), local('PTSans-Regular'), url('../lib/css/fonts/ptsans.woff') format('woff');
}

@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url('fonts/opensans.woff') format('woff');
src: local('Open Sans'), local('OpenSans'), url('../lib/css/fonts/opensans.woff') format('woff');
}

@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 400;
src: local('Lato Regular'), local('Lato-Regular'), url('fonts/lato.woff') format('woff');
src: local('Lato Regular'), local('Lato-Regular'), url('../lib/css/fonts/lato.woff') format('woff');
}

@font-face {
font-family: 'Cabin';
font-style: normal;
font-weight: 400;
src: local('Cabin Regular'), local('Cabin-Regular'), url('fonts/cabin.woff') format('woff');
src: local('Cabin Regular'), local('Cabin-Regular'), url('../lib/css/fonts/cabin.woff') format('woff');
}

@font-face {
font-family: 'Pacifico';
font-style: normal;
font-weight: normal;
src: local('Pacifico Regular'), local('Pacifico-Regular'), url('fonts/pacifico.woff') format('woff');
src: local('Pacifico Regular'), local('Pacifico-Regular'), url('../lib/css/fonts/pacifico.woff') format('woff');
}

@font-face {
font-family: 'Oleo Script';
font-style: normal;
font-weight: 400;
src: local('Oleo Script'), local('OleoScript-Regular'), url('fonts/oleoscript.woff') format('woff');
src: local('Oleo Script'), local('OleoScript-Regular'), url('../lib/css/fonts/oleoscript.woff') format('woff');
}

@font-face {
font-family: 'Cookie';
font-style: normal;
font-weight: 400;
src: local('Cookie-Regular'), url('fonts/cookie.woff') format('woff');
src: local('Cookie-Regular'), url('../lib/css/fonts/cookie.woff') format('woff');
}

@font-face {
font-family: 'Marck Script';
font-style: normal;
font-weight: 400;
src: local('Marck Script'), local('MarckScript-Regular'), url('fonts/marckscript.woff') format('woff');
src: local('Marck Script'), local('MarckScript-Regular'), url('../lib/css/fonts/marckscript.woff') format('woff');
}

+ 0
- 82
public/css/ui/overlay.css 查看文件

@@ -1,82 +0,0 @@
/* https://github.com/LearnBoost/CSS3-Overlay/ */

body.overlaid {
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
}

body.overlaid div.overlay {
-webkit-transform: translateY(0);
-moz-transform: translateY(0);
transform: translateY(0);
}

div.overlay {
/* using display none to hide the overlay nullifies -webkit-transition */
-webkit-transform: translateY(-50000px);
-moz-transform: translateY(-50000px);
transform: translateY(-50000px);

position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: rgba(0,0,0,0.4);

-webkit-user-select: auto;
-moz-user-select: auto;
user-select: auto;
}
div.overlay > div.wrap-outer {
position: relative;
width: 100%;
height: 100%;

display: -webkit-box;
display: -moz-box;
display: box;

-webkit-box-orient: horizontal;
-moz-box-orient: horizontal;
box-orient: horizontal;

-webkit-box-align: stretch;
-moz-box-align: stretch;
box-align: stretch;

-webkit-box-pack: center;
-moz-box-pack: center;
box-pack: center;
}
div.overlay > div.wrap-outer > div.wrap {
display: -webkit-box;
display: -moz-box;
display: box;
-webkit-box-orient: vertical;
-moz-box-orient: vertical;
box-orient: vertical;

-webkit-box-align: stretch;
-moz-box-align: stretch;
box-align: stretch;

-webkit-box-pack: center;
-moz-box-pack: center;
box-pack: center;
}

div.overlay > div.wrap-outer > div.wrap > * {
-webkit-box-flex: 0;
-moz-box-flex: 0;
box-flex: 0;

display: block;
}

div.overlay > div.wrap-outer > div.wrap > div.dialog {
padding: 21px;
background-color: #fff;
}

+ 0
- 12
public/css/ui/status_bar.css 查看文件

@@ -1,12 +0,0 @@
div.status_bar_outer {
background-color: rgba(0,0,0,0.1);
border: 1px solid rgba(0,0,0,0.4);
height: 21px;
width: 240px;
}

div.status_bar_inner {
background: #aaf; /* Old browsers */
height: 21px;
width: 0%;
}

+ 1
- 1
public/js/legacy/utils/dom.js 查看文件

@@ -62,7 +62,7 @@ wn.ele = {
link: function(args) {
var span = $a(args.parent, 'span', 'link_type', args.style);
span.loading_img = $a(args.parent,'img','',{margin:'0px 4px -2px 4px', display:'none'});
span.loading_img.src= 'images/lib/ui/button-load.gif';
span.loading_img.src= 'lib/images/ui/button-load.gif';

span.innerHTML = args.label;
span.user_onclick = args.onclick;


+ 13
- 13
public/js/lib/Aristo/aristo.selected.css 查看文件

@@ -63,7 +63,7 @@
.ui-widget-content a { color: #4F4F4F; }
.ui-widget-header { border: 1px solid #B6B6B6; color: #4F4F4F; font-weight: bold; }
.ui-widget-header {
background: #ededed url(../js/lib/Aristo/images/bg_fallback.png) 0 0 repeat-x; /* Old browsers */
background: #ededed url(../lib/js/lib/Aristo/images/bg_fallback.png) 0 0 repeat-x; /* Old browsers */
background: -moz-linear-gradient(top, #ededed 0%, #c4c4c4 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(100%,#c4c4c4)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Chrome10+,Safari5.1+ */
@@ -77,7 +77,7 @@
----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #B6B6B6; font-weight: normal; color: #4F4F4F; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
background: #ededed url(../js/lib/Aristo/images/bg_fallback.png) 0 0 repeat-x; /* Old browsers */
background: #ededed url(../lib/js/lib/Aristo/images/bg_fallback.png) 0 0 repeat-x; /* Old browsers */
background: -moz-linear-gradient(top, #ededed 0%, #c4c4c4 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ededed), color-stop(100%,#c4c4c4)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #ededed 0%,#c4c4c4 100%); /* Chrome10+,Safari5.1+ */
@@ -94,7 +94,7 @@
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {
outline: none;
color: #1c4257; border: 1px solid #7096ab;
background: #ededed url(../js/lib/Aristo/images/bg_fallback.png) 0 -50px repeat-x; /* Old browsers */
background: #ededed url(../lib/js/lib/Aristo/images/bg_fallback.png) 0 -50px repeat-x; /* Old browsers */
background: -moz-linear-gradient(top, #b9e0f5 0%, #92bdd6 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b9e0f5), color-stop(100%,#92bdd6)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #b9e0f5 0%,#92bdd6 100%); /* Chrome10+,Safari5.1+ */
@@ -123,14 +123,14 @@
----------------------------------*/

/* states and images */
.ui-icon { width: 16px; height: 16px; background-image: url(../js/lib/Aristo/images/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(../js/lib/Aristo/images/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(../js/lib/Aristo/images/ui-icons_222222_256x240.png); }
.ui-state-default .ui-icon { background-image: url(../js/lib/Aristo/images/ui-icons_454545_256x240.png); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(../js/lib/Aristo/images/ui-icons_454545_256x240.png); }
.ui-state-active .ui-icon {background-image: url(../js/lib/Aristo/images/ui-icons_454545_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(../js/lib/Aristo/images/ui-icons_454545_256x240.png); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon { background: url(../js/lib/Aristo/images/icon_sprite.png) -16px 0 no-repeat !important; }
.ui-icon { width: 16px; height: 16px; background-image: url(../lib/js/lib/Aristo/images/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(../lib/js/lib/Aristo/images/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(../lib/js/lib/Aristo/images/ui-icons_222222_256x240.png); }
.ui-state-default .ui-icon { background-image: url(../lib/js/lib/Aristo/images/ui-icons_454545_256x240.png); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(../lib/js/lib/Aristo/images/ui-icons_454545_256x240.png); }
.ui-state-active .ui-icon {background-image: url(../lib/js/lib/Aristo/images/ui-icons_454545_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(../lib/js/lib/Aristo/images/ui-icons_454545_256x240.png); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon { background: url(../lib/js/lib/Aristo/images/icon_sprite.png) -16px 0 no-repeat !important; }
.ui-state-highlight .ui-icon, .ui-state-error .ui-icon { margin-top: -1px; }

/* positioning */
@@ -255,7 +255,7 @@
.ui-icon-video { background-position: -224px -128px; }
.ui-icon-script { background-position: -240px -128px; }
.ui-icon-alert { background-position: 0 -144px; }
.ui-icon-info { background: url(../js/lib/Aristo/images/icon_sprite.png) 0 0 no-repeat !important; }
.ui-icon-info { background: url(../lib/js/lib/Aristo/images/icon_sprite.png) 0 0 no-repeat !important; }
.ui-icon-notice { background-position: -32px -144px; }
.ui-icon-help { background-position: -48px -144px; }
.ui-icon-check { background-position: -64px -144px; }
@@ -421,7 +421,7 @@
.ui-datepicker .ui-datepicker-next span { background-position: -16px -32px !important; }
.ui-datepicker .ui-datepicker-prev-hover span { background-position: 0px -48px !important; }
.ui-datepicker .ui-datepicker-next-hover span { background-position: -16px -48px !important; }
.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; background: url(../js/lib/Aristo/images/icon_sprite.png) no-repeat; }
.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; background: url(../lib/js/lib/Aristo/images/icon_sprite.png) no-repeat; }
.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; font-size: 12px; text-shadow: 0 1px 0 rgba(255,255,255,0.6); }
.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
.ui-datepicker select.ui-datepicker-month-year {width: 100%;}


+ 4
- 4
public/js/lib/jQuery.Gantt/css/style.css 查看文件

@@ -101,7 +101,7 @@
.fn-gantt .dataPanel {
margin-left: 0px;
border-right: 1px solid #DDD;
background-image: url(js/lib/jQuery.Gantt/img/grid.png);
background-image: url(lib/js/lib/jQuery.Gantt/img/grid.png);
background-repeat: repeat;
background-position: 24px 24px;
}
@@ -294,7 +294,7 @@
.fn-gantt .navigate .nav-slider-button {
width: 17px;
height: 60px;
background: url(js/lib/jQuery.Gantt/img/slider_handle.png) center center no-repeat;
background: url(lib/js/lib/jQuery.Gantt/img/slider_handle.png) center center no-repeat;
left: 0px;
top: 0px;
margin: -26px 0 0 0;
@@ -325,7 +325,7 @@
width: 20px;
height: 20px;
font-size: 0px;
background: #595959 url(js/lib/jQuery.Gantt/img/icon_sprite.png) !important;
background: #595959 url(lib/js/lib/jQuery.Gantt/img/icon_sprite.png) !important;
border: 1px solid #454546;
cursor: pointer;
vertical-align: top;
@@ -401,7 +401,7 @@
}

.fn-gantt-loader {
background-image: url(js/lib/jQuery.Gantt/img/loader_bg.png);
background-image: url(lib/js/lib/jQuery.Gantt/img/loader_bg.png);
z-index: 30;
}



+ 1
- 1
public/js/wn/dom.js 查看文件

@@ -148,7 +148,7 @@ wn.dom.set_box_shadow = function(ele, spread) {
if(ele.loading_img) {
$(ele.loading_img).toggle(true);
} else {
ele.loading_img = $('<img src="images/lib/ui/button-load.gif" \
ele.loading_img = $('<img src="lib/images/ui/button-load.gif" \
style="margin-left: 4px; margin-bottom: -2px; display: inline;" />')
.insertAfter(ele);
}


+ 1
- 1
public/js/wn/misc/user.js 查看文件

@@ -3,7 +3,7 @@
wn.user_info = function(uid) {
var def = {
'fullname':uid,
'image': 'images/lib/ui/no_img_m.gif'
'image': 'lib/images/ui/no_img_m.gif'
}
if(!wn.boot.user_info) return def
if(!wn.boot.user_info[uid]) return def


+ 1
- 1
public/js/wn/ui/button.js 查看文件

@@ -29,7 +29,7 @@ wn.ui.Button = function(args) {

// ajax loading
me.loading_img = wn.dom.add(me.btn.args.parent,'img','',{margin:'0px 4px -2px 4px', display:'none'});
me.loading_img.src= 'images/lib/ui/button-load.gif';
me.loading_img.src= 'lib/images/ui/button-load.gif';

// label
me.btn.innerHTML = args.label;


+ 1
- 1
public/js/wn/ui/listing.js 查看文件

@@ -99,7 +99,7 @@ wn.ui.Listing = Class.extend({
<div class="list-toolbar" style="display:inline-block; margin-right: 10px;">\
</div>\
<div style="display:inline-block; width: 24px; margin-left: 4px">\
<img src="images/lib/ui/button-load.gif" \
<img src="lib/images/ui/button-load.gif" \
class="img-load"/></div>\
</div><div style="clear:both"></div>\
\


+ 1
- 1
public/js/wn/ui/toolbar/toolbar.js 查看文件

@@ -41,7 +41,7 @@ wn.ui.toolbar.Toolbar = Class.extend({
<a class="brand"></a>\
<ul class="nav">\
</ul>\
<img src="images/lib/ui/spinner.gif" id="spinner"/>\
<img src="lib/images/ui/spinner.gif" id="spinner"/>\
<ul class="nav pull-right">\
<li class="dropdown">\
<a class="dropdown-toggle" data-toggle="dropdown" href="#" \


+ 1
- 1
webnotes/boot.py 查看文件

@@ -86,7 +86,7 @@ def get_fullnames():
d = {}
for r in ret:
if not r[2]:
r[2] = 'images/lib/ui/no_img_m.gif'
r[2] = 'lib/images/ui/no_img_m.gif'
else:
r[2] = 'files/' + r[2]


+ 1
- 1
webnotes/model/doctype.py 查看文件

@@ -287,7 +287,7 @@ class _DocType:
# embed all require files
import re
def _sub(match):
fpath = os.path.join(os.path.dirname(conf.__file__), 'app',
fpath = os.path.join(os.path.dirname(conf.__file__),
re.search('["\'][^"\']*["\']', match.group(0)).group(0)[1:-1])
if os.path.exists(fpath):
with open(fpath, 'r') as f:


+ 2
- 2
webnotes/utils/bundlejs.py 查看文件

@@ -77,7 +77,7 @@ class Bundle:
tmpmin = tmpout.getvalue() or ''
tmpmin.strip('\n')
outtxt += tmpmin
with open(outfile, 'w') as f:
f.write(outtxt)
@@ -152,7 +152,7 @@ class Bundle:
appfiles = eval(bfile.read())
else:
appfiles = {}
# add additional app files in bdata
buildfile_list = [builddict.keys()[0] for builddict in bdata]
for f in appfiles:


+ 8
- 4
wnf.py 查看文件

@@ -266,29 +266,33 @@ def run():
# git
elif options.status:
os.system('git status')
os.chdir('lib')
os.system('git status')
os.chdir('../app')
os.system('git status')

elif options.git:
os.system('git %s' % options.git)
os.chdir('lib')
os.system('git %s' % options.git)
os.chdir('../app')
os.system('git %s' % options.git)
elif options.pull:
pull(options.pull[0], options.pull[1])

elif options.push:
os.chdir('lib')
os.system('git commit -a -m "%s"' % options.push[2])
os.system('git push %s %s' % (options.push[0], options.push[1]))
os.chdir('lib')
os.chdir('../app')
os.system('git commit -a -m "%s"' % options.push[2])
os.system('git push %s %s' % (options.push[0], options.push[1]))
elif options.checkout:
os.system('git checkout %s' % options.checkout)
os.chdir('lib')
os.system('git checkout %s' % options.checkout)
os.chdir('../app')
os.system('git checkout %s' % options.checkout)
# patch
elif options.patch_list:


Loading…
取消
儲存