Guanxiying
e01d24354d
# Please enter the commit message for your changes. Lines starting
diff --git a/module/measurement/view/definition.html.php b/module/measurement/view/definition.html.php
index 622f3b9a25..cfdeb7b27b 100644
--- a/module/measurement/view/definition.html.php
+++ b/module/measurement/view/definition.html.php
@@ -65,7 +65,7 @@ $(function()
if(method == 'C') return definition.del();
definition.setFormula(method,'method');
- })
+ })
$('#basicmeas').change(function()
{
@@ -106,7 +106,7 @@ var definition = {
{
var methodObj = $('#formula-box span');
var methods = [];
-
+
methodObj.each(function()
{
methods.push($(this).attr('data-method'));
diff --git a/module/measurement/view/editcollectconf.html.php b/module/measurement/view/editcollectconf.html.php
index 7b6f3cd1bc..4990f3e822 100644
--- a/module/measurement/view/editcollectconf.html.php
+++ b/module/measurement/view/editcollectconf.html.php
@@ -55,7 +55,7 @@ if($measurement->collectType == 'crontab')
<?php if($measurement->collectType == 'crontab') echo html::hidden('config[type]', $measurement->collectConf->type)?>
<?php if($measurement->collectType == 'action') echo html::hidden('config[type]', 'week')?>
</td>
-</tr>
+</tr>
<script>
$(function()
{
@@ -77,9 +77,8 @@ $(function()
$('#collectType').change();
$('ul.nav-tabs a').click(function()
- {
+ {
if($(this).data('type'))$('input[id*=type][id*=config]').val($(this).data('type'));
});
-
});
</script>
diff --git a/module/measurement/view/edittemplate.html.php b/module/measurement/view/edittemplate.html.php
index 21a1e44d68..a09a53399a 100644
--- a/module/measurement/view/edittemplate.html.php
+++ b/module/measurement/view/edittemplate.html.php
@@ -15,7 +15,7 @@
<th><?php echo $lang->measurement->content;?></th>
<td colspan='2' class='tips'>
<?php echo html::textarea('content', $template->content, "class='form-control'");?>
- <i class="icon icon-exclamation-sign icon-rotate-180"></i>
+ <i class="icon icon-exclamation-sign icon-rotate-180"></i>
<?php echo $lang->measurement->tips->click2InsertData;?>
</td>
</tr>
diff --git a/module/measurement/view/menu.html.php b/module/measurement/view/menu.html.php
index e78fb61fe8..440f194677 100644
--- a/module/measurement/view/menu.html.php
+++ b/module/measurement/view/menu.html.php
@@ -1,4 +1,4 @@
-<?php
+<?php
$this->app->loadLang('measurement');
js::set('methodName', $this->app->methodName);
?>
85 lines
3.3 KiB
PHP
85 lines
3.3 KiB
PHP
<style>
|
|
#module_chosen {width: 50%!important}
|
|
</style>
|
|
<tr>
|
|
<th class='thWidth'><?php echo $lang->measurement->collectType;?></th>
|
|
<td class='w-400px'>
|
|
<?php echo html::select('collectType', $lang->measurement->collectTypeList, $measurement->collectType, "class='form-control chosen'");?>
|
|
</td><td></td>
|
|
</tr>
|
|
<tr class='actionConfig <?php if($measurement->collectType == 'crontab') echo "hidden";?>'>
|
|
<th><?php echo $lang->measurement->actionConfig;?></th>
|
|
<td>
|
|
<?php $collectAction = isset($measurement->collectConf->action) ? $measurement->collectConf->action : '';?>
|
|
<?php echo html::select('action', $triggerOptions, $collectAction, "class='form-control chosen'");?>
|
|
</td>
|
|
</tr>
|
|
<?php
|
|
$weekTabActive = '';
|
|
$monthTabActive = '';
|
|
if($measurement->collectType == 'crontab')
|
|
{
|
|
$weekTabActive = zget($measurement->collectConf, 'type', '') == 'week' ? 'active' : '';
|
|
$monthTabActive = zget($measurement->collectConf, 'type', '') == 'month' ? 'active' : '';
|
|
}
|
|
?>
|
|
<tr class='cycleConfig'>
|
|
<th><?php echo $lang->measurement->cycleConfig;?></th>
|
|
<td colspan='2'>
|
|
<ul class="nav nav-tabs">
|
|
<li class='<?php echo $weekTabActive?>'><a data-tab data-type='week' href="#week"><?php echo $lang->measurement->cycleWeek;?></a></li>
|
|
<li class='<?php echo $monthTabActive?>'><a data-tab data-type='month' href="#month"><?php echo $lang->measurement->cycleMonth;?></a></li>
|
|
</ul>
|
|
<div class="tab-content">
|
|
<div class="tab-pane clearfix <?php echo $weekTabActive?>" id="week">
|
|
<?php echo html::checkbox('config[week]', $lang->measurement->dayNames, zget($measurement->collectConf, 'week'))?>
|
|
</div>
|
|
<div class="tab-pane clearfix <?php echo $monthTabActive?>" id="month">
|
|
<?php
|
|
$days = array();
|
|
for($i = 1; $i <= 10; $i ++) $days[$i] = $i;
|
|
echo html::checkbox('config[month]', $days, zget($measurement->collectConf, 'month'));
|
|
$days = array();
|
|
for($i = 11; $i <= 20; $i ++) $days[$i] = $i;
|
|
echo html::checkbox('config[month]', $days, zget($measurement->collectConf, 'month'));
|
|
$days = array();
|
|
for($i = 21; $i <= 31; $i ++) $days[$i] = $i;
|
|
echo html::checkbox('config[month]', $days, zget($measurement->collectConf, 'month'));
|
|
?>
|
|
</div>
|
|
</div>
|
|
<div class='input-group'>
|
|
<span class='input-group-addon'><?php echo $lang->measurement->execTime;?></span>
|
|
<?php echo html::input('execTime', $measurement->execTime, "class='form-control form-time w-200px'");?>
|
|
</div>
|
|
<?php if($measurement->collectType == 'crontab') echo html::hidden('config[type]', $measurement->collectConf->type)?>
|
|
<?php if($measurement->collectType == 'action') echo html::hidden('config[type]', 'week')?>
|
|
</td>
|
|
</tr>
|
|
<script>
|
|
$(function()
|
|
{
|
|
$(document).on('change', '#collectType', function()
|
|
{
|
|
var collectType = $('#collectType').val();
|
|
if(collectType == 'crontab')
|
|
{
|
|
$('.cycleConfig').removeClass('hidden');
|
|
$('.actionConfig').addClass('hidden');
|
|
}
|
|
else
|
|
{
|
|
$('.actionConfig').removeClass('hidden');
|
|
$('.cycleConfig').addClass('hidden');
|
|
}
|
|
})
|
|
|
|
$('#collectType').change();
|
|
|
|
$('ul.nav-tabs a').click(function()
|
|
{
|
|
if($(this).data('type'))$('input[id*=type][id*=config]').val($(this).data('type'));
|
|
});
|
|
});
|
|
</script>
|