clean up setup screen a bit

johndoh · johndoh · commit c906d938593a · 2014-03-18T18:13:36.000Z
diff --git a/sieverules.php b/sieverules.php
@@ -331,7 +331,7 @@ function init_setup()
 			'sieverulessetup' => array($this, 'gen_setup'),
 		));
 
-		$this->api->output->set_pagetitle($this->gettext('filters'));
+		$this->api->output->set_pagetitle($this->gettext('importfilters'));
 		$this->api->output->send('sieverules.setupsieverules');
 	}
 
@@ -626,7 +626,6 @@ function gen_setup()
 			$out .= "&nbsp;&nbsp;" . $this->api->output->button(array('command' => 'plugin.sieverules.import', 'prop' => '_import=_none_', 'type' => 'input', 'class' => 'button', 'label' => 'cancel'));
 
 			$out = html::tag('p', array('style' => 'text-align: center; padding: 10px;'), "\n" . $out);
-			$out = html::tag('div', array('id' => 'prefs-title', 'class' => 'boxtitle'), rcmail::Q($this->gettext('importfilters'))) . $out;
 
 			return $out;
 		}
diff --git a/skins/classic/templates/setupsieverules.html b/skins/classic/templates/setupsieverules.html
@@ -13,6 +13,7 @@
 <script type="text/javascript" src="/functions.js"></script>
 </head>
 <body onload="parent.rcmail.sieverules_disable_ruleset_options();" class="iframe">
+<div id="prefs-title" class="boxtitle"><roundcube:object name="steptitle" /></div>
 <roundcube:object name="sieverulessetup" />
 </body>
 </html>
diff --git a/skins/larry/templates/setupsieverules.html b/skins/larry/templates/setupsieverules.html
@@ -19,8 +19,6 @@ <h1 class="boxtitle"><roundcube:object name="steptitle" /></h1>
 <roundcube:object name="sieverulessetup" class="propform" />
 </div>
 
-</div>
-
 <roundcube:include file="/includes/footer.html" />
 
 </body>

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ function init_setup()`
`331`	`331`	`'sieverulessetup' => array($this, 'gen_setup'),`
`332`	`332`	`));`
`333`	`333`
`334`		`- $this->api->output->set_pagetitle($this->gettext('filters'));`
	`334`	`+ $this->api->output->set_pagetitle($this->gettext('importfilters'));`
`335`	`335`	`$this->api->output->send('sieverules.setupsieverules');`
`336`	`336`	`}`
`337`	`337`
`@@ -626,7 +626,6 @@ function gen_setup()`
`626`	`626`	`$out .= "  " . $this->api->output->button(array('command' => 'plugin.sieverules.import', 'prop' => '_import=_none_', 'type' => 'input', 'class' => 'button', 'label' => 'cancel'));`
`627`	`627`
`628`	`628`	`$out = html::tag('p', array('style' => 'text-align: center; padding: 10px;'), "\n" . $out);`
`629`		`- $out = html::tag('div', array('id' => 'prefs-title', 'class' => 'boxtitle'), rcmail::Q($this->gettext('importfilters'))) . $out;`
`630`	`629`
`631`	`630`	`return $out;`
`632`	`631`	`}`