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);
?>
31 lines
1.3 KiB
PHP
31 lines
1.3 KiB
PHP
<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
|
|
<?php include $app->getModuleRoot() . 'common/view/kindeditor.html.php';?>
|
|
<div id="mainContent" class="main-content fade">
|
|
<div class="center-block">
|
|
<div class="main-header">
|
|
<h2><?php echo $lang->measurement->editTemplate;?></h2>
|
|
</div>
|
|
<form class="load-indicator main-form form-ajax" method='post' enctype='multipart/form-data' id='dataform'>
|
|
<table class="table table-form">
|
|
<tr>
|
|
<th><?php echo $lang->measurement->name;?></th>
|
|
<td><?php echo html::input('name', $template->name, "class='form-control'");?></td>
|
|
</tr>
|
|
<tr>
|
|
<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>
|
|
<?php echo $lang->measurement->tips->click2InsertData;?>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td colspan='3' class='form-actions text-center'><?php echo html::submitButton() . html::backButton();?></td>
|
|
</tr>
|
|
</table>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
<?php include './holdermodal.html.php';?>
|
|
<?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>
|