Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 7052145

Browse files
author
Charles Ma
committed
ENH: refs #301 Fixed job test
Added scheduled job Added dynamic input file Added result gid
1 parent 27d4a00 commit 7052145

File tree

31 files changed

+2134
-164
lines changed

31 files changed

+2134
-164
lines changed

‎core/models/GlobalDao.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ public function get($var)
127127
}
128128
if(method_exists($this, 'get' . ucfirst($var)))
129129
{
130-
return call_user_func('get' . ucfirst($var), $var);
130+
$name = 'get' . ucfirst($var);
131+
return $this->$name($var);
131132
}
132133
elseif(isset($this->$var))
133134
{

‎core/public/css/browse/browse.selectitem.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ padding: 3px 10px 3px 24px;
2828
width: 400px;
2929
-webkit-box-shadow: #666 0 0 3px;
3030
box-shadow: #666 0 0 3px;
31-
-moz-box-shadow: 0px 0px 15px #666;
31+
-moz-box-shadow: 0px 0px 3px #666;
3232
width:200px;
3333
}
3434

‎core/public/css/jquery/jquery.timepicker-addon.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
2+
.ui-timepicker-div dl { text-align: left; }
3+
.ui-timepicker-div dl dt { height: 25px; }
4+
.ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; }
5+
.ui-timepicker-div td { font-size: 90%; }
6+
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }

‎core/public/css/layout/jquery-ui.css‎

Lines changed: 98 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@
301301
*
302302
* http://docs.jquery.com/UI/Autocomplete#theming
303303
*/
304-
.ui-autocomplete { position: absolute; cursor: default; }
304+
.ui-autocomplete { position: absolute; cursor: default; }
305305

306306
/* workarounds */
307307
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
@@ -356,7 +356,7 @@
356356
*/
357357
.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
358358
.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
359-
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
359+
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
360360
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
361361
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
362362
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
@@ -394,4 +394,99 @@
394394
* http://docs.jquery.com/UI/Progressbar#theming
395395
*/
396396
.ui-progressbar { height:2em; text-align: left; }
397-
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
397+
.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
398+
399+
400+
* jQuery UI Datepicker 1.8.16
401+
*
402+
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
403+
* Dual licensed under the MIT or GPL Version 2 licenses.
404+
* http://jquery.org/license
405+
*
406+
* http://docs.jquery.com/UI/Datepicker#theming
407+
*/
408+
.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
409+
.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
410+
.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
411+
.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
412+
.ui-datepicker .ui-datepicker-prev { left:2px; }
413+
.ui-datepicker .ui-datepicker-next { right:2px; }
414+
.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
415+
.ui-datepicker .ui-datepicker-next-hover { right:1px; }
416+
.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; }
417+
.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
418+
.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
419+
.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
420+
.ui-datepicker select.ui-datepicker-month,
421+
.ui-datepicker select.ui-datepicker-year { width: 49%;}
422+
.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
423+
.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
424+
.ui-datepicker td { border: 0; padding: 1px; }
425+
.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
426+
.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
427+
.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
428+
.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
429+
430+
/* with multiple calendars */
431+
.ui-datepicker.ui-datepicker-multi { width:auto; }
432+
.ui-datepicker-multi .ui-datepicker-group { float:left; }
433+
.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
434+
.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
435+
.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
436+
.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
437+
.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
438+
.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
439+
.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
440+
.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
441+
442+
/* RTL support */
443+
.ui-datepicker-rtl { direction: rtl; }
444+
.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
445+
.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
446+
.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
447+
.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
448+
.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
449+
.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
450+
.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
451+
.ui-datepicker-rtl .ui-datepicker-group { float:right; }
452+
.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
453+
.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
454+
455+
/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
456+
.ui-datepicker-cover {
457+
display: none; /*sorry for IE5*/
458+
display/**/: block; /*sorry for IE5*/
459+
position: absolute; /*must have*/
460+
z-index: -1; /*must have*/
461+
filter: mask(); /*must have*/
462+
top: -4px; /*must have*/
463+
left: -4px; /*must have*/
464+
width: 200px; /*must have*/
465+
height: 200px; /*must have*/
466+
}
467+
468+
/*
469+
470+
* jQuery UI Slider 1.8.16
471+
*
472+
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
473+
* Dual licensed under the MIT or GPL Version 2 licenses.
474+
* http://jquery.org/license
475+
*
476+
* http://docs.jquery.com/UI/Slider#theming
477+
*/
478+
.ui-slider { position: relative; text-align: left; }
479+
.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
480+
.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
481+
482+
.ui-slider-horizontal { height: .8em; }
483+
.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
484+
.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
485+
.ui-slider-horizontal .ui-slider-range-min { left: 0; }
486+
.ui-slider-horizontal .ui-slider-range-max { right: 0; }
487+
488+
.ui-slider-vertical { width: .8em; height: 100px; }
489+
.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
490+
.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
491+
.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
492+
.ui-slider-vertical .ui-slider-range-max { top: 0; }

‎core/public/css/upload/upload.revision.css‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@ width:94%!important;
1212

1313
}
1414
#jqueryFileUploadContent{
15-
15+
1616
}
1717

1818
/* -- Form Styles ------------------------------- */
19-
#swfuploadContent form {
19+
#swfuploadContent form {
2020
margin: 0;
2121
padding: 0;
2222
}
2323

24+
.globalButton{
25+
margin-top: 3px!important;
26+
}
2427

2528

2629
#swfuploadContent div.fieldset {
@@ -64,8 +67,8 @@ width:94%!important;
6467
#swfuploadContent button,
6568
#swfuploadContent input,
6669
#swfuploadContent select,
67-
#swfuploadContent textarea {
68-
border-width: 1px;
70+
#swfuploadContent textarea {
71+
border-width: 1px;
6972
margin-bottom: 10px;
7073
padding: 2px 3px;
7174
}
@@ -75,9 +78,9 @@ width:94%!important;
7578
#swfuploadContent input[disabled]{ border: 1px solid #ccc } /* FF 2 Fix */
7679

7780

78-
#swfuploadContent label {
79-
width: 150px;
80-
text-align: right;
81+
#swfuploadContent label {
82+
width: 150px;
83+
text-align: right;
8184
display:block;
8285
margin-right: 5px;
8386
}
@@ -138,7 +141,7 @@ width:94%!important;
138141
white-space: nowrap;
139142
overflow: hidden;
140143
display: inline;
141-
144+
142145
}
143146

144147
#swfuploadContent .progressBarInProgress,

0 commit comments

Comments
 (0)