Skip to content

L
LimeSurvey26lts_improved
Commit ca1a18bb authored by Sam's avatar Sam
Browse files
Options

Dev Fixed flash message not shown. 

Dev Fixed tooltips not working.
parent 00be44e1
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 23 deletions
application/controllers/AdminController.php
View file @ ca1a18bb
......@@ -329,7 +329,16 @@ class AdminController extends LSYii_Controller
$data['css_admin_includes'] = $this->_css_admin_includes(array(), true);
return $this->renderPartial("/admin/super/header", $data, $return);
$out = $this->renderPartial("/admin/super/header", $data, true);
App()->getClientScript()->render($out);
if ($return)
{
return $out;
}
else
{
echo $out;
}
}
/**
......
application/extensions/FlashMessage/FlashMessage.php
View file @ ca1a18bb
<?php
class FlashMessage extends CWidget {
public function run() {
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('third_party') . 'jqueryui/js/jquery-ui-1.10.0.custom.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.notify.js');
if (!empty(App()->session['flashmessage']) && Yii::app()->session['flashmessage'] != '')
{
$message = App()->session['flashmessage'];
......@@ -12,9 +14,6 @@ class FlashMessage extends CWidget {
{
$this->render('message', compact('key', 'message'));
}
}
}
?>
\ No newline at end of file
application/extensions/FlashMessage/views/message.php
View file @ ca1a18bb
......@@ -9,6 +9,4 @@
<span style="float:left; margin:2px 5px 0 0;" class="ui-icon ui-icon-info">&nbsp;</span>
<p><?php echo $message; ?></p><br>
</div>
<!-- other templates here, maybe.. -->
</div>
\ No newline at end of file
application/views/admin/super/header.php
View file @ ca1a18bb
......@@ -16,6 +16,7 @@
<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->getConfig('adminstyleurl');?>adminstyle.css" />
<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->getConfig('styleurl');?>adminstyle.css" />
<?php
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.qtip.js');
if(!empty($css_admin_includes)) {
foreach ($css_admin_includes as $cssinclude)
{
......@@ -35,6 +36,7 @@
<link rel="shortcut icon" href="<?php echo $baseurl;?>styles/favicon.ico" type="image/x-icon" />
<link rel="icon" href="<?php echo $baseurl;?>styles/favicon.ico" type="image/x-icon" />
<?php echo $firebug ?>
<?php $this->widget('ext.LimeScript.LimeScript'); ?>
</head>
<body>
<?php if(isset($formatdata)) { ?>
......@@ -44,21 +46,5 @@
</script>
<?php } ?>
<div class='wrapper'>
<?php if(isset($flashmessage)) { ?>
<div id="flashmessage" style="display:none;">
<div id="themeroller" class="ui-state-highlight ui-corner-all">
<!-- close link -->
<a class="ui-notify-close" href="#">
<span class="ui-icon ui-icon-close" style="float:right">&nbsp;</span>
</a>
<!-- alert icon -->
<span style="float:left; margin:2px 5px 0 0;" class="ui-icon ui-icon-info">&nbsp;</span>
<p><?php echo $flashmessage; ?></p><br>
</div>
<!-- other templates here, maybe.. -->
</div>
<?php } ?>
<?php $this->widget('ext.FlashMessage.FlashMessage'); ?>
<div class='maintitle'><?php echo $sitename; ?></div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment