Project

General

Profile

« Previous | Next » 

Revision 3db61e83

Added by Andreas Kohlbecker over 4 years ago

ref #8739 description page: improved dom and using stylesheets instead of html tags

View differences:

modules/cdm_dataportal/includes/descriptions.inc
2142 2142
  }
2143 2143
  $out .= icon_link($path_to_description);
2144 2144

  
2145
  $out .= '<div class="content-caption">Bracketed numbers denote sample size.</div>';
2145
  if($show_description_elements){
2146
    $out .= '<div class="content-caption">Bracketed numbers denote sample size.</div>';
2147
  }
2146 2148

  
2147 2149
  return $out;
2148 2150
}
......
2265 2267
    }
2266 2268

  
2267 2269

  
2270
  $described_entities = [];
2268 2271
  if (isset($description->describedSpecimenOrObservation)) {
2269
    $render_array['specimen'] = markup_to_render_array("<b>Specimen</b><br>");
2270
    $render_array['specimen_link'] = markup_to_render_array(render_cdm_specimen_link($description->describedSpecimenOrObservation));
2272
    $decr_entitiy = '<span class="label">Specimen:</span> ' . render_cdm_specimen_link($description->describedSpecimenOrObservation);
2273
    $described_entities['specimen'] = markup_to_render_array($decr_entitiy, null, '<div>', '</div>');
2271 2274
  }
2272 2275
  if (isset($description->taxon)) {
2273
    $render_array['taxon'] = markup_to_render_array("<b>Taxon</b><br>");
2274
    $render_array['taxon_link'] = markup_to_render_array(render_taxon_or_name($description->taxon, url(path_to_taxon($description->taxon->uuid))));
2276
    $decr_entitiy = '<span class="label">Taxon:</span> ' . render_taxon_or_name($description->taxon, url(path_to_taxon($description->taxon->uuid)));
2277
    $described_entities['taxon'] = markup_to_render_array($decr_entitiy, null, '<div>', '</div>');
2278
  }
2279

  
2280
  if(count($described_entities)){
2281
    $render_array['described_entities'] = $described_entities;
2282
    $render_array['described_entities']['#prefix'] = '<div class="described-entities">';
2283
    $render_array['described_entities']['#suffix'] = '</div>';
2275 2284
  }
2276 2285

  
2286

  
2277 2287
  $root_nodes = get_root_nodes_for_dataset($description);
2278 2288

  
2279 2289
  $header = ['Feature/Character', 'State'];
......
2282 2292
  $rows = compose_description_element_rows($root_nodes, $rows);
2283 2293

  
2284 2294
  if (!empty($rows)) {
2285
    $render_array[] = markup_to_render_array(theme('table', [
2295
    $render_array['table'] = markup_to_render_array(theme('table', [
2286 2296
      'header' => $header,
2287 2297
      'rows' => $rows,
2288 2298
      'caption' => "Bracketed numbers denote sample size.",
......
2300 2310
            $source_link_markup = render_taxon_or_name($cdm_source_entity) . icon_link(path_to_taxon($cdm_source_entity->uuid, false), generalizeString(PSEUDO_FEATURE_AGGREGATION_DESCRIPTIONS));
2301 2311
            break;
2302 2312
          case 'TaxonDescription':
2303
          case 'SpecimenDescription':
2304 2313
          case 'NameDescription':
2314
          case 'SpecimenDescription':
2305 2315
            $source_link_markup = render_cdm_description($cdm_source_entity);
2306 2316
            break;
2307 2317
          default:
......
2312 2322
        ];
2313 2323
      }
2314 2324
    }
2315
    $render_array[] = [
2325
    $render_array['sources'] = [
2316 2326
      '#title' => 'Sources',
2317 2327
      '#theme' => 'item_list',
2318 2328
      '#type' => 'ul',
2319 2329
      '#items' => $items,
2330
      '#attributes' => ['class' => 'sources']
2320 2331
    ];
2332
    $render_array['#prefix'] = '<div class="description-table">';
2333
    $render_array['#suffix'] = '</div>';
2321 2334
  }
2322 2335

  
2323 2336
  RenderHints::popFromRenderStack();
themes/zen_dataportal/css/cdm.css
148 148
  padding: 0 0 0 0;
149 149
}
150 150

  
151
/* line 87, ../sass/cdm.scss */
152
.description-table .described-entities .label {
153
  font-weight: bold;
154
}
155

  
151 156
/*
152 157
 * Search results
153 158
 */
......
173 178
#search_results .Taxon a:visited {
174 179
  color: #115e92;
175 180
}
176
/* line 94, ../sass/cdm.scss */
181
/* line 101, ../sass/cdm.scss */
177 182
#search_results table {
178 183
  margin: 1em 0;
179 184
}
180 185

  
181
/* line 99, ../sass/cdm.scss */
186
/* line 106, ../sass/cdm.scss */
182 187
div.cdm-item-list div.item {
183 188
  margin: 9px 0;
184 189
}
......
186 191
/*
187 192
 * Taxon page and parts
188 193
 */
189
/* line 107, ../sass/cdm.scss */
194
/* line 114, ../sass/cdm.scss */
190 195
.page-part {
191 196
  margin-bottom: 18px;
192 197
  clear: none;
......
196 201
 * definition list container rendered by the
197 202
 * drupal theme function theme_description_list()
198 203
 */
199
/* line 117, ../sass/cdm.scss */
204
/* line 124, ../sass/cdm.scss */
200 205
.description_list h3 {
201 206
  font-size: 12px;
202 207
  line-height: 18px;
......
206 211
/*
207 212
 * Synonymy
208 213
 */
209
/* line 131, ../sass/cdm.scss */
214
/* line 138, ../sass/cdm.scss */
210 215
#synonymy div.accepted-name {
211 216
  margin-bottom: -1em;
212 217
  margin-top: 1em;
213 218
}
214
/* line 136, ../sass/cdm.scss */
219
/* line 143, ../sass/cdm.scss */
215 220
#synonymy .homotypic-synonymy-group, #synonymy .heterotypic-synonymy-group, #synonymy .taxon-relationships {
216 221
  border-bottom: 1px solid #DEDEDE;
217 222
  /* replace padding by margin */
......
222 227
/*
223 228
 * Media
224 229
 */
225
/* line 147, ../sass/cdm.scss */
230
/* line 154, ../sass/cdm.scss */
226 231
dl.media-caption {
227 232
  margin: 0;
228 233
}
229 234

  
230
/* line 151, ../sass/cdm.scss */
235
/* line 158, ../sass/cdm.scss */
231 236
.media-caption dd {
232 237
  margin-left: 0;
233 238
}
234
/* line 153, ../sass/cdm.scss */
239
/* line 160, ../sass/cdm.scss */
235 240
.media-caption dd .title {
236 241
  font-size: 100%;
237 242
}
238 243

  
239
/* line 158, ../sass/cdm.scss */
244
/* line 165, ../sass/cdm.scss */
240 245
.image-gallerie td.caption {
241 246
  padding-bottom: 1em;
242 247
}
......
244 249
/*
245 250
 * specimens and type designations
246 251
 */
247
/* line 166, ../sass/cdm.scss */
252
/* line 173, ../sass/cdm.scss */
248 253
#specimens table.media_gallery {
249 254
  margin-top: 0.2em;
250 255
}
251
/* line 169, ../sass/cdm.scss */
256
/* line 176, ../sass/cdm.scss */
252 257
#specimens .description_list {
253 258
  clear: both;
254 259
}
255
/* line 171, ../sass/cdm.scss */
260
/* line 178, ../sass/cdm.scss */
256 261
#specimens .description_list h3 {
257 262
  margin-top: 0;
258 263
  background-color: #ddd;
259 264
}
260
/* line 175, ../sass/cdm.scss */
265
/* line 182, ../sass/cdm.scss */
261 266
#specimens .description_list h4 {
262 267
  clear: left;
263 268
  margin-bottom: 0;
264 269
  font-style: italic;
265 270
}
266
/* line 181, ../sass/cdm.scss */
271
/* line 188, ../sass/cdm.scss */
267 272
#specimens .dynabox_content {
268 273
  margin-left: 10px;
269 274
  margin-right: 10px;
270 275
}
271
/* line 185, ../sass/cdm.scss */
276
/* line 192, ../sass/cdm.scss */
272 277
#specimens .block-cdm-dataportal-feature {
273 278
  margin-left: 20px;
274 279
  margin-bottom: 0;
275 280
}
276
/* line 188, ../sass/cdm.scss */
281
/* line 195, ../sass/cdm.scss */
277 282
#specimens .block-cdm-dataportal-feature h2 {
278 283
  font-size: 12px;
279 284
  line-height: 18px;
280 285
  font-weight: bold;
281 286
}
282
/* line 195, ../sass/cdm.scss */
287
/* line 202, ../sass/cdm.scss */
283 288
#specimens ul.typeDesignations {
284 289
  clear: both;
285 290
}
286
/* line 198, ../sass/cdm.scss */
291
/* line 205, ../sass/cdm.scss */
287 292
#specimens .dna-sequence div {
288 293
  font-size: 12px;
289 294
  font-family: monospace;
290 295
  clear: left;
291 296
  padding-left: 20px;
292 297
}
293
/* line 204, ../sass/cdm.scss */
298
/* line 211, ../sass/cdm.scss */
294 299
#specimens .derived_from {
295 300
  clear: both;
296 301
}
......
298 303
/*
299 304
 * Map
300 305
 */
301
/* line 212, ../sass/cdm.scss */
306
/* line 219, ../sass/cdm.scss */
302 307
.openlayers-container {
303 308
  margin-top: 5px;
304 309
  margin-bottom: 5px;
......
307 312
/*
308 313
 * Registration page & items
309 314
 */
310
/* line 222, ../sass/cdm.scss */
315
/* line 229, ../sass/cdm.scss */
311 316
.registration .type-status {
312 317
  font-weight: bold;
313 318
}
314
/* line 226, ../sass/cdm.scss */
319
/* line 233, ../sass/cdm.scss */
315 320
.registration .registration-date-and-institute {
316 321
  color: #999;
317 322
}
318
/* line 232, ../sass/cdm.scss */
323
/* line 239, ../sass/cdm.scss */
319 324
.registration .published-name .TaxonName .name {
320 325
  font-weight: bold;
321 326
}
322
/* line 236, ../sass/cdm.scss */
327
/* line 243, ../sass/cdm.scss */
323 328
.registration .typified-name .cdm\:TaxonName {
324 329
  color: #999;
325 330
}
326
/* line 238, ../sass/cdm.scss */
331
/* line 245, ../sass/cdm.scss */
327 332
.registration .typified-name .cdm\:TaxonName a {
328 333
  color: #999;
329 334
}
330
/* line 241, ../sass/cdm.scss */
335
/* line 248, ../sass/cdm.scss */
331 336
.registration .typified-name .cdm\:TaxonName .TaxonName .name {
332 337
  font-weight: bold;
333 338
}
334
/* line 247, ../sass/cdm.scss */
339
/* line 254, ../sass/cdm.scss */
335 340
.registration .registration-summary .registered_name .name {
336 341
  font-weight: bold;
337 342
}
338
/* line 250, ../sass/cdm.scss */
343
/* line 257, ../sass/cdm.scss */
339 344
.registration .registration-summary .referenced_typified_name {
340 345
  color: #999;
341 346
}
342
/* line 253, ../sass/cdm.scss */
347
/* line 260, ../sass/cdm.scss */
343 348
.registration .registration-summary .label {
344 349
  font-weight: bold;
345 350
}
......
347 352
/*
348 353
 * Theme settings page
349 354
 */
350
/* line 264, ../sass/cdm.scss */
355
/* line 271, ../sass/cdm.scss */
351 356
#system-theme-settings .image-preview {
352 357
  width: 600px;
353 358
  max-height: 150px;
354 359
  overflow: auto;
355 360
}
356
/* line 268, ../sass/cdm.scss */
361
/* line 275, ../sass/cdm.scss */
357 362
#system-theme-settings .image-preview img {
358 363
  max-width: none;
359 364
  /* reset style in mormalize.scss */
......
364 369
 *
365 370
 * using the same media queries here as in layout/_responsive.scss
366 371
 *****************************************************************************************/
367
/* line 281, ../sass/cdm.scss */
372
/* line 288, ../sass/cdm.scss */
368 373
#classification-breadcrumbs {
369 374
  font-size: 1.5em;
370 375
  line-height: 1.5em;
371 376
}
372 377

  
373 378
@media all and (min-width: 960px) {
374
  /* line 292, ../sass/cdm.scss */
379
  /* line 299, ../sass/cdm.scss */
375 380
  #classification-breadcrumbs {
376 381
    font-size: 1em;
377 382
  }
themes/zen_dataportal/css/styles.css
2209 2209
  padding: 0 0 0 0;
2210 2210
}
2211 2211

  
2212
/* line 87, ../sass/cdm.scss */
2213
.description-table .described-entities .label {
2214
  font-weight: bold;
2215
}
2216

  
2212 2217
/*
2213 2218
 * Search results
2214 2219
 */
......
2234 2239
#search_results .Taxon a:visited {
2235 2240
  color: #115e92;
2236 2241
}
2237
/* line 94, ../sass/cdm.scss */
2242
/* line 101, ../sass/cdm.scss */
2238 2243
#search_results table {
2239 2244
  margin: 1em 0;
2240 2245
}
2241 2246

  
2242
/* line 99, ../sass/cdm.scss */
2247
/* line 106, ../sass/cdm.scss */
2243 2248
div.cdm-item-list div.item {
2244 2249
  margin: 9px 0;
2245 2250
}
......
2247 2252
/*
2248 2253
 * Taxon page and parts
2249 2254
 */
2250
/* line 107, ../sass/cdm.scss */
2255
/* line 114, ../sass/cdm.scss */
2251 2256
.page-part {
2252 2257
  margin-bottom: 18px;
2253 2258
  clear: none;
......
2257 2262
 * definition list container rendered by the
2258 2263
 * drupal theme function theme_description_list()
2259 2264
 */
2260
/* line 117, ../sass/cdm.scss */
2265
/* line 124, ../sass/cdm.scss */
2261 2266
.description_list h3 {
2262 2267
  font-size: 12px;
2263 2268
  line-height: 18px;
......
2267 2272
/*
2268 2273
 * Synonymy
2269 2274
 */
2270
/* line 131, ../sass/cdm.scss */
2275
/* line 138, ../sass/cdm.scss */
2271 2276
#synonymy div.accepted-name {
2272 2277
  margin-bottom: -1em;
2273 2278
  margin-top: 1em;
2274 2279
}
2275
/* line 136, ../sass/cdm.scss */
2280
/* line 143, ../sass/cdm.scss */
2276 2281
#synonymy .homotypic-synonymy-group, #synonymy .heterotypic-synonymy-group, #synonymy .taxon-relationships {
2277 2282
  border-bottom: 1px solid #DEDEDE;
2278 2283
  /* replace padding by margin */
......
2283 2288
/*
2284 2289
 * Media
2285 2290
 */
2286
/* line 147, ../sass/cdm.scss */
2291
/* line 154, ../sass/cdm.scss */
2287 2292
dl.media-caption {
2288 2293
  margin: 0;
2289 2294
}
2290 2295

  
2291
/* line 151, ../sass/cdm.scss */
2296
/* line 158, ../sass/cdm.scss */
2292 2297
.media-caption dd {
2293 2298
  margin-left: 0;
2294 2299
}
2295
/* line 153, ../sass/cdm.scss */
2300
/* line 160, ../sass/cdm.scss */
2296 2301
.media-caption dd .title {
2297 2302
  font-size: 100%;
2298 2303
}
2299 2304

  
2300
/* line 158, ../sass/cdm.scss */
2305
/* line 165, ../sass/cdm.scss */
2301 2306
.image-gallerie td.caption {
2302 2307
  padding-bottom: 1em;
2303 2308
}
......
2305 2310
/*
2306 2311
 * specimens and type designations
2307 2312
 */
2308
/* line 166, ../sass/cdm.scss */
2313
/* line 173, ../sass/cdm.scss */
2309 2314
#specimens table.media_gallery {
2310 2315
  margin-top: 0.2em;
2311 2316
}
2312
/* line 169, ../sass/cdm.scss */
2317
/* line 176, ../sass/cdm.scss */
2313 2318
#specimens .description_list {
2314 2319
  clear: both;
2315 2320
}
2316
/* line 171, ../sass/cdm.scss */
2321
/* line 178, ../sass/cdm.scss */
2317 2322
#specimens .description_list h3 {
2318 2323
  margin-top: 0;
2319 2324
  background-color: #ddd;
2320 2325
}
2321
/* line 175, ../sass/cdm.scss */
2326
/* line 182, ../sass/cdm.scss */
2322 2327
#specimens .description_list h4 {
2323 2328
  clear: left;
2324 2329
  margin-bottom: 0;
2325 2330
  font-style: italic;
2326 2331
}
2327
/* line 181, ../sass/cdm.scss */
2332
/* line 188, ../sass/cdm.scss */
2328 2333
#specimens .dynabox_content {
2329 2334
  margin-left: 20px;
2330 2335
  margin-right: 20px;
2331 2336
}
2332
/* line 185, ../sass/cdm.scss */
2337
/* line 192, ../sass/cdm.scss */
2333 2338
#specimens .block-cdm-dataportal-feature {
2334 2339
  margin-left: 40px;
2335 2340
  margin-bottom: 0;
2336 2341
}
2337
/* line 188, ../sass/cdm.scss */
2342
/* line 195, ../sass/cdm.scss */
2338 2343
#specimens .block-cdm-dataportal-feature h2 {
2339 2344
  font-size: 12px;
2340 2345
  line-height: 18px;
2341 2346
  font-weight: bold;
2342 2347
}
2343
/* line 195, ../sass/cdm.scss */
2348
/* line 202, ../sass/cdm.scss */
2344 2349
#specimens ul.typeDesignations {
2345 2350
  clear: both;
2346 2351
}
2347
/* line 198, ../sass/cdm.scss */
2352
/* line 205, ../sass/cdm.scss */
2348 2353
#specimens .dna-sequence div {
2349 2354
  font-size: 12px;
2350 2355
  font-family: monospace;
2351 2356
  clear: left;
2352 2357
  padding-left: 40px;
2353 2358
}
2354
/* line 204, ../sass/cdm.scss */
2359
/* line 211, ../sass/cdm.scss */
2355 2360
#specimens .derived_from {
2356 2361
  clear: both;
2357 2362
}
......
2359 2364
/*
2360 2365
 * Map
2361 2366
 */
2362
/* line 212, ../sass/cdm.scss */
2367
/* line 219, ../sass/cdm.scss */
2363 2368
.openlayers-container {
2364 2369
  margin-top: 10px;
2365 2370
  margin-bottom: 10px;
......
2368 2373
/*
2369 2374
 * Registration page & items
2370 2375
 */
2371
/* line 222, ../sass/cdm.scss */
2376
/* line 229, ../sass/cdm.scss */
2372 2377
.registration .type-status {
2373 2378
  font-weight: bold;
2374 2379
}
2375
/* line 226, ../sass/cdm.scss */
2380
/* line 233, ../sass/cdm.scss */
2376 2381
.registration .registration-date-and-institute {
2377 2382
  color: #999;
2378 2383
}
2379
/* line 232, ../sass/cdm.scss */
2384
/* line 239, ../sass/cdm.scss */
2380 2385
.registration .published-name .TaxonName .name {
2381 2386
  font-weight: bold;
2382 2387
}
2383
/* line 236, ../sass/cdm.scss */
2388
/* line 243, ../sass/cdm.scss */
2384 2389
.registration .typified-name .cdm\:TaxonName {
2385 2390
  color: #999;
2386 2391
}
2387
/* line 238, ../sass/cdm.scss */
2392
/* line 245, ../sass/cdm.scss */
2388 2393
.registration .typified-name .cdm\:TaxonName a {
2389 2394
  color: #999;
2390 2395
}
2391
/* line 241, ../sass/cdm.scss */
2396
/* line 248, ../sass/cdm.scss */
2392 2397
.registration .typified-name .cdm\:TaxonName .TaxonName .name {
2393 2398
  font-weight: bold;
2394 2399
}
2395
/* line 247, ../sass/cdm.scss */
2400
/* line 254, ../sass/cdm.scss */
2396 2401
.registration .registration-summary .registered_name .name {
2397 2402
  font-weight: bold;
2398 2403
}
2399
/* line 250, ../sass/cdm.scss */
2404
/* line 257, ../sass/cdm.scss */
2400 2405
.registration .registration-summary .referenced_typified_name {
2401 2406
  color: #999;
2402 2407
}
2403
/* line 253, ../sass/cdm.scss */
2408
/* line 260, ../sass/cdm.scss */
2404 2409
.registration .registration-summary .label {
2405 2410
  font-weight: bold;
2406 2411
}
......
2408 2413
/*
2409 2414
 * Theme settings page
2410 2415
 */
2411
/* line 264, ../sass/cdm.scss */
2416
/* line 271, ../sass/cdm.scss */
2412 2417
#system-theme-settings .image-preview {
2413 2418
  width: 600px;
2414 2419
  max-height: 150px;
2415 2420
  overflow: auto;
2416 2421
}
2417
/* line 268, ../sass/cdm.scss */
2422
/* line 275, ../sass/cdm.scss */
2418 2423
#system-theme-settings .image-preview img {
2419 2424
  max-width: none;
2420 2425
  /* reset style in mormalize.scss */
......
2425 2430
 *
2426 2431
 * using the same media queries here as in layout/_responsive.scss
2427 2432
 *****************************************************************************************/
2428
/* line 281, ../sass/cdm.scss */
2433
/* line 288, ../sass/cdm.scss */
2429 2434
#classification-breadcrumbs {
2430 2435
  font-size: 1.5em;
2431 2436
  line-height: 1.5em;
2432 2437
}
2433 2438

  
2434 2439
@media all and (min-width: 960px) {
2435
  /* line 292, ../sass/cdm.scss */
2440
  /* line 299, ../sass/cdm.scss */
2436 2441
  #classification-breadcrumbs {
2437 2442
    font-size: 1em;
2438 2443
  }
themes/zen_dataportal/sass/cdm.scss
83 83
    padding: 0 0 0 0;
84 84
  }
85 85

  
86
  .description-table .described-entities {
87
    .label {
88
      font-weight: bold;
89
    }
90

  
91
  }
92

  
86 93
  /*
87 94
   * Search results
88 95
   */

Also available in: Unified diff