| Index: trunk/extensions/SemanticDrilldown/includes/SD_Utils.php |
| — | — | @@ -142,7 +142,8 @@ |
| 143 | 143 | $enter_values_label.' <input size="40" name="sd_filter_values_starter" value=""> |
| 144 | 144 | </p>'; |
| 145 | 145 | } |
| 146 | | - if( $filter_array['InputType'] != null){ |
| | 146 | + |
| | 147 | + if( $filter_array['InputType'] != null){ |
| 147 | 148 | $input_type_val = $filter_array['InputType']; |
| 148 | 149 | $html_text .= '<p>'.$input_type_label.' |
| 149 | 150 | <select id="input_type_dropdown" name="sd_input_type_starter"> |
| — | — | @@ -151,19 +152,29 @@ |
| 152 | 153 | $html_text .= '<option selected value="'.$combo_box_value.'">'.$combo_box_label.'</option> |
| 153 | 154 | <option value="'.$date_range_value.'">'.$date_range_label.'</option> |
| 154 | 155 | </select> |
| 155 | | - </p></fieldset>'; |
| | 156 | + </p>'; |
| 156 | 157 | }else if( $input_type_val == $date_range_value ){ |
| 157 | 158 | $html_text .= '<option value="'.$combo_box_value.'">'.$combo_box_label.'</option> |
| 158 | 159 | <option selected value="'.$date_range_value.'">'.$date_range_label.'</option> |
| 159 | 160 | </select> |
| 160 | | - </p></fieldset>'; |
| | 161 | + </p>'; |
| 161 | 162 | }else{ |
| 162 | 163 | $html_text .= '<option value="'.$combo_box_value.'">'.$combo_box_label.'</option> |
| 163 | 164 | <option value="'.$date_range_value.'">'.$date_range_label.'</option> |
| 164 | 165 | </select> |
| 165 | | - </p></fieldset>'; |
| | 166 | + </p>'; |
| 166 | 167 | } |
| 167 | | - } |
| | 168 | + }else{ |
| | 169 | + $html_text .= '<p>'.$input_type_label.' |
| | 170 | + <select id="input_type_dropdown" name="sd_input_type_starter"> |
| | 171 | + <option selected value="">'.$values_list_label.'</option>'; |
| | 172 | + $html_text .= '<option value="'.$combo_box_value.'">'.$combo_box_label.'</option> |
| | 173 | + <option value="'.$date_range_value.'">'.$date_range_label.'</option> |
| | 174 | + </select> |
| | 175 | + </p>'; |
| | 176 | + } |
| | 177 | + |
| | 178 | + $html_text .= '</fieldset>'; |
| 168 | 179 | $html_text_array[] = $html_text; |
| 169 | 180 | $html_text = ""; |
| 170 | 181 | } |
| — | — | @@ -215,7 +226,7 @@ |
| 216 | 227 | global $wgContLang; |
| 217 | 228 | |
| 218 | 229 | $text = ""; |
| 219 | | - $text .= '<fieldset style="background: #FF0080;"><legend>Filter</legend>'; |
| | 230 | + $text .= '<fieldset style="background: #FDD;"><legend>Filter</legend>'; |
| 220 | 231 | $name_label = wfMsg( 'sd_createfilter_name' ); |
| 221 | 232 | $property_label = wfMsg( 'sd_createfilter_property' ); |
| 222 | 233 | $label_label = wfMsg( 'sd_createfilter_label' ); |