Project

General

Profile

« Previous | Next » 

Revision 13d33727

Added by Alexander Oppermann about 11 years ago

*added garland-style.css bug fix concerning the fieldset images (expanded/collapsed)
*added bug fix for the administration panel -> if variables were not set, the concerning fieldset is not displayed anymore.

View differences:

7.x/modules/cdm_dataportal/cdm_csv_export/cdm_csv_export.module
139 139
    ),
140 140
  );
141 141
  
142

  
142
  $country = variable_get('area_filter_country');
143
  $state = variable_get('area_filter_state');
144
if($country != null || $state != null){
143 145
  $form['regionFilter'] = array(
144 146
    '#type' => 'fieldset',
145 147
    '#title' => t('Geographical filter'),
146 148
    '#collapsible' => TRUE,
147 149
    '#collapsed' => TRUE,
148
    );
150
  );
151
 }
149 152

  
153
  
154
  
150 155
  define('CDM_WS_TERM', 'term/$0');
151
  $term = cdm_ws_get(CDM_WS_TERM, variable_get('area_filter_country'));
156
  $term = cdm_ws_get(CDM_WS_TERM, $country);
152 157
  $cdmRepresentationTitleCache = cdm_term_representation($term);
158
  if($country != null){
153 159
  $form['regionFilter']['country'] = array (
154 160
    '#type' => 'checkbox',
155 161
    '#title' => t($cdmRepresentationTitleCache),
156 162
    '#attributes' => array('name' => 'area',
157 163
                            'id' => 'checkall',
158
                            'value' => variable_get('area_filter_country')
164
                            'value' =>  $country
159 165
     ),
160 166
    );
167
  }
161 168
  
162 169
  //GermanFederalStates
163
  $nameRelationshipTypeOptions = cdm_Vocabulary_as_option(variable_get('area_filter_state'));
170
  if($state != null){
171
  $nameRelationshipTypeOptions = cdm_Vocabulary_as_option($state);
164 172
  $form['regionFilter']['area'] = array(
165 173
    '#type' => 'checkboxes',
166 174
    '#description' =>t('Select an area to filter the list of taxa'),
......
169 177
                            'id' => 'area',
170 178
      ),
171 179
    );
180
  }
172 181
  
173 182
  $form['button'] = array(
174 183
    '#type'  => 'submit',
......
180 189
                 'name' => 'exportForm',
181 190
                 'onsubmit' => 'return blockUIForDownload()');
182 191
  
183
  return $form;
192
 return $form;
184 193
}
185 194

  
186 195

  
7.x/themes/garland_cichorieae/style.css
890 890
  padding-bottom: .6em;
891 891
}
892 892

  
893
html.js fieldset.collapsible .fieldset-legend {
894
  background: url(images/menu-expanded.gif) no-repeat 0% 50%;
895
  padding-left: 2em;
896
}
897

  
898
html.js fieldset.collapsed .fieldset-legend {
899
  background: url(images/menu-collapsed.gif) no-repeat 0% 50%;
900
}
901

  
902
/*
893 903
html.js fieldset.collapsible legend a {
894 904
  padding-left: 2em;
895 905
  background: url(images/menu-expanded.gif) no-repeat 0% 50%;
......
898 908
html.js fieldset.collapsed legend a {
899 909
  background: url(images/menu-collapsed.gif) no-repeat 0% 50%;
900 910
}
911
*/
901 912

  
902 913
/**
903 914
 * Syndication icons and block

Also available in: Unified diff