Permalink
Browse files

Dev Working on a new admin style (gringegreen)

  • Loading branch information...
1 parent 229e8fa commit 2308a5c2743cf38ea37c8695532c2b19a5184063 @c-schmitz c-schmitz committed Apr 27, 2012
Showing with 42 additions and 44 deletions.
  1. +2 −2 application/controllers/admin/export.php
  2. +1 −2 application/controllers/admin/question.php
  3. +1 −1 application/controllers/admin/questiongroup.php
  4. +1 −1 application/controllers/admin/quotas.php
  5. +1 −1 application/controllers/admin/surveypermission.php
  6. +1 −1 application/controllers/admin/usergroups.php
  7. +2 −3 application/views/admin/survey/Question/questionbar_view.php
  8. +2 −3 application/views/admin/survey/QuestionGroups/questiongroupbar_view.php
  9. +23 −25 application/views/admin/survey/surveybar_view.php
  10. +2 −3 styles/gringegreen/adminstyle.css
  11. BIN styles/gringegreen/images/arrows.png
  12. BIN styles/gringegreen/images/assessments_30.png
  13. BIN styles/gringegreen/images/backup.png
  14. BIN styles/gringegreen/images/copy.png
  15. BIN styles/gringegreen/images/dumpgroup.png
  16. BIN styles/gringegreen/images/dumpquestion.png
  17. BIN styles/gringegreen/images/edit.png
  18. BIN styles/gringegreen/images/edit_30.png
  19. BIN styles/gringegreen/images/emailtemplates.png
  20. BIN styles/gringegreen/images/emailtemplates_30.png
  21. BIN styles/gringegreen/images/export.png
  22. BIN styles/gringegreen/images/export_30.png
  23. BIN styles/gringegreen/images/export_disabled_30.png
  24. BIN styles/gringegreen/images/expressionmanager_30.png
  25. BIN styles/gringegreen/images/preview.png
  26. BIN styles/gringegreen/images/print_30.png
  27. BIN styles/gringegreen/images/quality_assurance.png
  28. BIN styles/gringegreen/images/quality_assurance_30.png
  29. BIN styles/gringegreen/images/tools.png
  30. BIN styles/gringegreen/images/translate_30.png
  31. BIN styles/gringegreen/images/translate_disabled.png
  32. BIN styles/gringegreen/images/translate_disabled_30.png
  33. +6 −2 styles/gringegreen/superfish.css
@@ -1325,7 +1325,7 @@ private function _exportexcel($surveyid)
$this->_addHeaders($fn, "text/csv", 0);
$data =& LimeExpressionManager::ExcelSurveyExport($surveyid);
-
+
Yii::import('application.libraries.admin.pear.Spreadsheet.Excel.Xlswriter', true);
// actually generate an Excel workbook
@@ -1377,7 +1377,7 @@ private function _addHeaders($filename, $content_type, $expires, $pragma = "publ
*/
protected function _renderWrappedTemplate($sAction = 'export', $aViewUrls = array(), $aData = array())
{
- $this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/'.Yii::app()->getConfig("admintheme").'/superfish.css');
+ $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
$aData['display']['menu_bars']['gid_action'] = 'exportstructureGroup';
@@ -1231,8 +1231,7 @@ protected function _renderWrappedTemplate($sAction = 'survey/Question', $aViewUr
{
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/jquery.dd.js');
$this->getController()->_css_admin_includes(Yii::app()->baseUrl . '/scripts/jquery/dd.css');
- $this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/".Yii::app()->getConfig('admintheme')."/superfish.css");
-
+ $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
}
@@ -409,7 +409,7 @@ public function update($gid)
*/
protected function _renderWrappedTemplate($sAction = 'survey/QuestionGroups', $aViewUrls = array(), $aData = array())
{
- $this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . "admin/".Yii::app()->getConfig('admintheme')."/superfish.css");
+ $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
}
@@ -561,7 +561,7 @@ protected function _renderWrappedTemplate($sAction = 'quotas', $aViewUrls = arra
{
$this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . '/jquery/jquery.tablesorter.min.js');
$this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . '/quotas.js');
- $this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl') . 'admin/'.Yii::app()->getConfig("admintheme").'/superfish.css');
+ $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
@@ -609,7 +609,7 @@ function surveyright($surveyid)
*/
protected function _renderWrappedTemplate($sAction = 'authentication', $aViewUrls = array(), $aData = array())
{
- $this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/".Yii::app()->getConfig('admintheme')."/superfish.css");
+ $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
}
@@ -419,7 +419,7 @@ function user($ugid, $action = 'add')
*/
protected function _renderWrappedTemplate($sAction = 'usergroup', $aViewUrls = array(), $aData = array())
{
- $this->getController()->_css_admin_includes(Yii::app()->getConfig('styleurl')."admin/".Yii::app()->getConfig('admintheme')."/superfish.css");
+ $this->getController()->_css_admin_includes(Yii::app()->getConfig('adminstyleurl')."superfish.css");
$this->getController()->_js_admin_includes(Yii::app()->baseUrl . 'scripts/admin/users.js');
$aData['display']['menu_bars']['user_group'] = true;
@@ -41,9 +41,8 @@
<?php if(hasSurveyPermission($surveyid,'surveyactivation','read'))
{ ?>
<img src='<?php echo $imageurl; ?>seperator.gif' alt='' />
- <a href="<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}/gid/{$gid}/qid/{$qid}/"); ?>','_blank')"
- title="<?php $clang->eTview("Survey logic file for current question"); ?>">
- <img src='<?php echo $imageurl; ?>quality_assurance.png' alt='<?php $clang->eT("Survey logic file for current question"); ?>' /></a>
+ <a href="<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}/gid/{$gid}/qid/{$qid}/"); ?>','_blank')">
+ <img src='<?php echo $imageurl; ?>quality_assurance.png' alt='<?php $clang->eT("Check survey logic for current question"); ?>' /></a>
<?php } ?>
<?php if ((($qct == 0 && $activated != "Y") || $activated != "Y") && hasSurveyPermission($surveyid,'surveycontent','delete'))
@@ -27,9 +27,8 @@
<?php if(hasSurveyPermission($surveyid,'surveyactivation','read'))
{ ?>
<img src='<?php echo $imageurl; ?>seperator.gif' alt='' />
- <a href="<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}/gid/{$gid}/"); ?>"
- title="<?php $clang->eTview("Survey logic file for current question group"); ?>">
- <img src='<?php echo $imageurl; ?>quality_assurance.png' alt='<?php $clang->eT("Survey logic file for current question group"); ?>' /></a>
+ <a href="<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}/gid/{$gid}/"); ?>">
+ <img src='<?php echo $imageurl; ?>quality_assurance.png' alt='<?php $clang->eT("Check survey logic for current question group"); ?>' /></a>
<?php } ?>
<?php
@@ -80,10 +80,10 @@
<?php } ?>
<?php if($onelanguage) { ?>
<li><a target='_blank' href='<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/$surveyid/");?>' >
- <img src='<?php echo $imageurl;?>quality_assurance.png' alt='' /> <?php $clang->eT("Survey logic file");?></a></li>
+ <img src='<?php echo $imageurl;?>quality_assurance_30.png' alt='' /> <?php $clang->eT("Survey logic file");?></a></li>
<?php } else { ?>
<li><a target='_blank' href='<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/$surveyid/");?>' >
- <img src='<?php echo $imageurl;?>quality_assurance.png' alt='' /> <?php $clang->eT("Survey logic file");?></a><ul>
+ <img src='<?php echo $imageurl;?>quality_assurance_30.png' alt='' /> <?php $clang->eT("Survey logic file");?></a><ul>
<?php foreach ($languagelist as $tmp_lang) { ?>
<li><a accesskey='d' target='_blank' href='<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/$surveyid/lang/$tmp_lang");?>'>
<img src='<?php echo $imageurl;?>quality_assurance.png' alt='' /> <?php echo getLanguageNameFromCode($tmp_lang,false);?></a></li>
@@ -116,42 +116,42 @@
<img src='<?php echo $imageurl;?>display_export.png' alt='<?php $clang->eT("Display / Export");?>' width="<?php echo $iIconSize;?>" height="<?php echo $iIconSize;?>"/></a><ul>
<?php if($surveyexport) { ?>
<li><a href='#'>
- <img src='<?php echo $imageurl;?>export_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Export...");?></a>
+ <img src='<?php echo $imageurl;?>export_30.png' alt='' /> <?php $clang->eT("Export...");?></a>
<?php } ?>
<ul>
<?php if($surveyexport) { ?>
<li><a href='<?php echo $this->createUrl("admin/export/survey/action/exportstructurexml/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>export_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Survey structure (.lss)");?></a>
+ <img src='<?php echo $imageurl;?>export_30.png' alt='' /> <?php $clang->eT("Survey structure (.lss)");?></a>
</li>
<?php } ?>
<?php if($respstatsread && $surveyexport) {
if ($activated){?>
<li><a href='<?php echo $this->createUrl("admin/export/survey/action/exportarchive/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>export_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Survey archive (.zip)");?></a></li>
+ <img src='<?php echo $imageurl;?>export_30.png' alt='' /> <?php $clang->eT("Survey archive (.zip)");?></a></li>
<?php }
else
{?>
<li><a href="#" onclick="alert('<?php $clang->eT("You can only archive active surveys.", "js");?>');" >
- <img src='<?php echo $imageurl;?>export_disabled_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Survey archive (.zip)");?></a></li><?php
+ <img src='<?php echo $imageurl;?>export_disabled_30.png' alt='' /> <?php $clang->eT("Survey archive (.zip)");?></a></li><?php
}
}?>
<?php if($surveyexport) { ?>
<li><a href='<?php echo $this->createUrl("admin/export/survey/action/exportstructurequexml/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>export_30.png' alt='' width="30" height="30"/> <?php $clang->eT("queXML format (*.xml)");?></a>
+ <img src='<?php echo $imageurl;?>export_30.png' alt='' /> <?php $clang->eT("queXML format (*.xml)");?></a>
</li>
<li><a href='<?php echo $this->createUrl("admin/export/survey/action/exportstructureexcel/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>export_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Excel format (*.xls)");?></a>
+ <img src='<?php echo $imageurl;?>export_30.png' alt='' /> <?php $clang->eT("Excel format (*.xls)");?></a>
</li>
<?php } ?>
</ul>
</li>
<?php if($onelanguage) { ?>
<li><a target='_blank' href='<?php echo $this->createUrl("admin/printablesurvey/index/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>print_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Printable version");?></a></li>
+ <img src='<?php echo $imageurl;?>print_30.png' alt='' /> <?php $clang->eT("Printable version");?></a></li>
<?php } else { ?>
<li><a target='_blank' href='<?php echo $this->createUrl("admin/printablesurvey/index/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>print_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Printable version");?></a><ul>
+ <img src='<?php echo $imageurl;?>print_30.png' alt='' /> <?php $clang->eT("Printable version");?></a><ul>
<?php foreach ($languagelist as $tmp_lang) { ?>
<li><a accesskey='d' target='_blank' href='<?php echo $this->createUrl("admin/printablesurvey/index/surveyid/$surveyid/lang/$tmp_lang");?>'>
<img src='<?php echo $imageurl;?>print_30.png' alt='' /> <?php echo getLanguageNameFromCode($tmp_lang,false);?></a></li>
@@ -161,13 +161,13 @@
<?php if($surveyexport) {
if($onelanguage) { ?>
<li><a href='<?php echo $this->createUrl("admin/export/showquexmlsurvey/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>scanner_30.png' alt='' width="30" height="30"/> <?php $clang->eT("QueXML export");?></a></li>
+ <img src='<?php echo $imageurl;?>export_30.png' alt='' /> <?php $clang->eT("QueXML export");?></a></li>
<?php } else { ?>
<li><a href='<?php echo $this->createUrl("admin/export/showquexmlsurvey/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>scanner_30.png' alt='' width="30" height="30"/> <?php $clang->eT("QueXML export");?></a><ul>
+ <img src='<?php echo $imageurl;?>export_30.png' alt='' /> <?php $clang->eT("QueXML export");?></a><ul>
<?php foreach ($languagelist as $tmp_lang) { ?>
<li><a accesskey='d' target='_blank' href='<?php echo $this->createUrl("admin/export/showquexmlsurvey/surveyid/$surveyid/lang/$tmp_lang");?>'>
- <img src='<?php echo $imageurl;?>scanner_30.png' alt=''/> <?php echo getLanguageNameFromCode($tmp_lang,false);?></a></li>
+ <img src='<?php echo $imageurl;?>export_30.png' alt=''/> <?php echo getLanguageNameFromCode($tmp_lang,false);?></a></li>
<?php } ?>
</ul></li>
<?php }
@@ -177,28 +177,28 @@
<?php if($respstatsread) {
if($activated) { ?>
<li><a href='<?php echo $this->createUrl("admin/browse/index/surveyid/$surveyid/");?>' >
- <img src='<?php echo $imageurl;?>browse_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Responses & statistics");?></a></li>
+ <img src='<?php echo $imageurl;?>browse_30.png' alt='' /> <?php $clang->eT("Responses & statistics");?></a></li>
<?php } else { ?>
<li><a href="#" onclick="alert('<?php $clang->eT("This survey is not active - no responses are available.","js");?>');" >
- <img src='<?php echo $imageurl;?>browse_disabled_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Responses & statistics");?></a></li>
+ <img src='<?php echo $imageurl;?>browse_disabled_30.png' alt='' /> <?php $clang->eT("Responses & statistics");?></a></li>
<?php }
} ?>
<?php if($responsescreate) {
if($activated) { ?>
<li><a href='<?php echo $this->createUrl("admin/dataentry/view/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>dataentry_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Data entry screen");?></a></li>
+ <img src='<?php echo $imageurl;?>dataentry_30.png' alt='' /> <?php $clang->eT("Data entry screen");?></a></li>
<?php } else { ?>
<li><a href="#" onclick="alert('<?php $clang->eT("This survey is not active, data entry is not allowed","js");?>');" >
- <img src='<?php echo $imageurl;?>dataentry_disabled_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Data entry screen");?></a></li>
+ <img src='<?php echo $imageurl;?>dataentry_disabled_30.png' alt='' /> <?php $clang->eT("Data entry screen");?></a></li>
<?php }
} ?>
<?php if($responsesread) {
if($activated) { ?>
<li><a href='<?php echo $this->createUrl("admin/saved/view/surveyid/$surveyid");?>' >
- <img src='<?php echo $imageurl;?>saved_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Partial (saved) responses");?></a></li>
+ <img src='<?php echo $imageurl;?>saved_30.png' alt='' /> <?php $clang->eT("Partial (saved) responses");?></a></li>
<?php } else { ?>
<li><a href="#" onclick="alert('<?php $clang->eT("This survey is not active - no responses are available","js");?>');" >
- <img src='<?php echo $imageurl;?>saved_disabled_30.png' alt='' width="30" height="30"/> <?php $clang->eT("Partial (saved) responses");?></a></li>
+ <img src='<?php echo $imageurl;?>saved_disabled_30.png' alt='' /> <?php $clang->eT("Partial (saved) responses");?></a></li>
<?php }
} ?>
</ul></li>
@@ -239,11 +239,11 @@
<?php if ($GidPrev != "")
{ ?>
<a href='<?php echo $this->createUrl("admin/survey/view/surveyid/$surveyid/gid/$GidPrev"); ?>'>
- <img src='<?php echo $imageurl; ?>previous_20.png' title='' alt='<?php $clang->eT("Previous question group"); ?>' width="20" height="20"/> </a>
+ <img src='<?php echo $imageurl; ?>previous_20.png' title='' alt='<?php $clang->eT("Previous question group"); ?>'/> </a>
<?php }
else
{ ?>
- <img src='<?php echo $imageurl; ?>previous_disabled_20.png' title='' alt='<?php $clang->eT("No previous question group"); ?>' width="20" height="20"/>
+ <img src='<?php echo $imageurl; ?>previous_disabled_20.png' title='' alt='<?php $clang->eT("No previous question group"); ?>' />
<?php }
@@ -252,14 +252,12 @@
<a href='<?php echo $this->createUrl("admin/survey/view/surveyid/$surveyid/gid/$GidNext"); ?>'>
- <img src='<?php echo $imageurl; ?>next_20.png' title='' alt='<?php $clang->eT("Next question group"); ?>'
- width="20" height="20"/> </a>
+ <img src='<?php echo $imageurl; ?>next_20.png' title='' alt='<?php $clang->eT("Next question group"); ?>'/> </a>
<?php }
else
{ ?>
- <img src='<?php echo $imageurl; ?>next_disabled_20.png' title='' alt='<?php $clang->eT("No next question group"); ?>'
- width="20" height="20"/>
+ <img src='<?php echo $imageurl; ?>next_disabled_20.png' title='' alt='<?php $clang->eT("No next question group"); ?>'/>
<?php } ?>
</span>
<?php } ?>
@@ -210,7 +210,6 @@ div.menubar .ui-widget-header
.menubar-right .arrow-wrapper {
display: inline; /* For IE */
position: relative;
- margin: 0 5px 0 5px;
width: 20px;
vertical-align: bottom;
}
@@ -226,7 +225,7 @@ html>body .menubar-right .arrow-wrapper { /* For real browsers */
.menubar-right .arrow-wrapper img {
display: block;
- margin: 0;
+ margin: 2px;
}
/* END menubar CSS */
@@ -331,7 +330,7 @@ input[disabled], textarea[disabled], select[disabled], button[disabled] {
textarea {
font-size: 10px;
- color: navy;
+ color: #000;
font-family: verdana, arial, sans-serif;
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 2308a5c

Please sign in to comment.