Skip to content

Commit

Permalink
Dev: Fixed: can not change user on list survey because button don't s…
Browse files Browse the repository at this point in the history
…hown

Dev: Allow change style of 'my survey' in survey list : remove inline style, add class: mysurvey emphasis
  • Loading branch information
Shnoulle committed Apr 8, 2013
1 parent dfe52c0 commit c0ebf40
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
6 changes: 3 additions & 3 deletions application/helpers/common_helper.php
Expand Up @@ -368,7 +368,7 @@ function getSurveyList($returnarray=false, $surveyid=false)
$inactivesurveys .= "<option ";
if(Yii::app()->user->getId() == $sv['owner_id'])
{
$inactivesurveys .= " style=\"font-weight: bold;\"";
$inactivesurveys .= " class='mysurvey emphasis'";
}
if ($sv['sid'] == $surveyid)
{
Expand All @@ -380,7 +380,7 @@ function getSurveyList($returnarray=false, $surveyid=false)
$expiredsurveys .="<option ";
if (Yii::app()->user->getId() == $sv['owner_id'])
{
$expiredsurveys .= " style=\"font-weight: bold;\"";
$expiredsurveys .= " class='mysurvey emphasis'";
}
if ($sv['sid'] == $surveyid)
{
Expand All @@ -392,7 +392,7 @@ function getSurveyList($returnarray=false, $surveyid=false)
$activesurveys .= "<option ";
if(Yii::app()->user->getId() == $sv['owner_id'])
{
$activesurveys .= " style=\"font-weight: bold;\"";
$activesurveys .= " class='mysurvey emphasis'";
}
if ($sv['sid'] == $surveyid)
{
Expand Down
2 changes: 1 addition & 1 deletion scripts/admin/listsurvey.js
Expand Up @@ -14,7 +14,7 @@ $(document).ready(function(){
old_owner = $($(oldThis).parent()).html();

old_owner = (old_owner.split("("))[0];
$($(oldThis).parent()).html('<select class="ownername_select" id="ownername_select_'+survey_id+'"></select>'
$($(oldThis).parent()).html('<select class="ownername_select" id="ownername_select_'+survey_id+'"></select>\n'
+ '<input class="ownername_button" id="ownername_button_'+survey_id+'" type="button" initial_text="'+initial_text+'" value="'+delBtnCaption+'">');
$(oData).each(function(key,value){
$('#ownername_select_'+survey_id).
Expand Down
2 changes: 2 additions & 0 deletions styles/blobblueish/adminstyle.css
Expand Up @@ -210,6 +210,7 @@ div.menubar .ui-widget-header
color: #333;
width: 200px;
}
.menubar option.emphasis{color:navy}

.menubar-right .arrow-wrapper {
display: inline; /* For IE */
Expand Down Expand Up @@ -341,6 +342,7 @@ input[disabled], textarea[disabled], select[disabled], button[disabled] {

}


.subtitle {
font-size: 10px;
color: #FFF;
Expand Down
4 changes: 3 additions & 1 deletion styles/gringegreen/adminstyle.css
Expand Up @@ -215,7 +215,9 @@ div.menubar .ui-widget-header
color: #333;
width: 200px;
}

.menubar option.emphasis{
font-weight:700
}
.menubar-right .arrow-wrapper {
display: inline; /* For IE */
position: relative;
Expand Down

0 comments on commit c0ebf40

Please sign in to comment.