Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to theming due to 1.7 changes #6

Merged
merged 11 commits into from Jun 1, 2012
2 changes: 1 addition & 1 deletion css/iphone.css
Expand Up @@ -5,4 +5,4 @@ input,select,textarea,.confirmation .container-inline a {
input[type=submit], input[type=submit],
button { button {
-webkit-appearance: none; -webkit-appearance: none;
} }
2 changes: 1 addition & 1 deletion css/layout.css
Expand Up @@ -566,4 +566,4 @@ h1, #ting-collection h1, .pane-title {
.no-reservations { .no-reservations {
padding: 0px; padding: 0px;
margin: 0 0 20px 0; margin: 0 0 20px 0;
} }
2 changes: 1 addition & 1 deletion css/mobile.css
@@ -1 +1 @@
/* TODO: Please explain the purpuse of this file? */ /* TODO: Please explain the purpuse of this file? */
36 changes: 15 additions & 21 deletions css/ting-object.css
Expand Up @@ -33,31 +33,15 @@
margin-left: 100px; margin-left: 100px;
} }


#ting-object .item-list { #ting-object .ting-object-buttons .item-list ul {
position: relative;
}

#ting-object .item-list h3 {
position: absolute;
left: 0;
margin: 0; margin: 0;
font-size: 1em;
} }


#ting-object .item-list ul { .ting-object-buttons ul li {
display: inline; list-style-type: none;
margin-left: 100px;
}

#ting-object .item-list li {
display: inline;
margin: 0; margin: 0;
} }


#ting-object .ting-object-buttons .item-list ul {
margin: 0;
}

.ting-object-buttons a { .ting-object-buttons a {
display: none; display: none;
} }
Expand Down Expand Up @@ -98,13 +82,23 @@ div.abstract {
padding: 1em 1em 1em 0; padding: 1em 1em 1em 0;
} }


#ting-object .additional-info .item-list { #ting-object .additional-info ul li {
padding: 3px 0 1px 100px; list-style-type: none;
margin: 0;
}

#ting-object .additional-info {
padding: 0 0 0 100px;
}

#ting-object .additional-info .item-list{
padding: 3px 0 1px 0;
} }


#ting-object .additional-info .item-list h3 { #ting-object .additional-info .item-list h3 {
left: 0; left: 0;
position: static; position: static;
margin: 0;
} }


#ting-object .additional-info .item-list ul { #ting-object .additional-info .item-list ul {
Expand Down
15 changes: 13 additions & 2 deletions css/ting-search.css
Expand Up @@ -76,14 +76,25 @@
display: none; display: none;
} }


.ting-overview .creator { .ting-overview .creator,
.ting-item .creator {
margin: 1em; margin: 1em;
color:#A1A1A2; color:#A1A1A2;
} }


.ting-overview .abstract { .ting-overview .abstract,
.ting-item .abstract {
margin:1em ; margin:1em ;
} }

.ting-item .series {
margin:1em ;
}

.ting-item .series li {
list-style-type: none;
margin: 0;
}


.ting-search-collection-types li { .ting-search-collection-types li {
list-style: none !important; list-style: none !important;
Expand Down
2 changes: 1 addition & 1 deletion css/typography.css
Expand Up @@ -2,4 +2,4 @@ body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
margin:0; margin:0;
font-size:14px; font-size:14px;
} }
2 changes: 1 addition & 1 deletion script/jquery.infieldlabel.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion template.php
Expand Up @@ -345,4 +345,4 @@ function alternator_ding_debt_list_form($form) {
$output .= drupal_render($form); $output .= drupal_render($form);


return $output; return $output;
} }
3 changes: 1 addition & 2 deletions templates/node/node-article.tpl.php
@@ -1,5 +1,4 @@
<?php <?php
// $Id: node.tpl.php,v 1.4.2.1 2009/08/10 10:48:33 goba Exp $


/** /**
* @file node.tpl.php * @file node.tpl.php
Expand Down Expand Up @@ -70,4 +69,4 @@
</div> </div>


<?php print $links; ?> <?php print $links; ?>
</div> </div>
3 changes: 1 addition & 2 deletions templates/node/node-event.tpl.php
@@ -1,5 +1,4 @@
<?php <?php
// $Id: node.tpl.php,v 1.4.2.1 2009/08/10 10:48:33 goba Exp $


/** /**
* @file node.tpl.php * @file node.tpl.php
Expand Down Expand Up @@ -75,4 +74,4 @@
</div> </div>


<!-- <?php print $links; ?> --> <!-- <?php print $links; ?> -->
</div> </div>
3 changes: 1 addition & 2 deletions templates/node/node.tpl.php
@@ -1,5 +1,4 @@
<?php <?php
// $Id: node.tpl.php,v 1.4.2.1 2009/08/10 10:48:33 goba Exp $


/** /**
* @file node.tpl.php * @file node.tpl.php
Expand Down Expand Up @@ -64,4 +63,4 @@
</div> </div>


<?php print $links; ?> <?php print $links; ?>
</div> </div>
38 changes: 20 additions & 18 deletions templates/ting/ting-list-item.tpl.php
@@ -1,5 +1,4 @@
<?php <?php
// $Id$
/** /**
* @file * @file
* Display a ting objects as part of a list. * Display a ting objects as part of a list.
Expand All @@ -17,39 +16,42 @@
*/ */
?> ?>
<!-- ting-list-item.tpl --> <!-- ting-list-item.tpl -->
<div id="ting-item-<?php print $local_id; ?>" class="ting-item clearfix graybox-btns"> <div id="ting-item-<?php print $ting_local_id; ?>" class="ting-item clearfix graybox-btns">
<div class="content clearfix clear-block"> <div class="content clearfix clear-block">
<div class="picture"> <div class="picture">
<?php if ($image) { ?> <?php if ($image) { ?>
<?php print $image; ?> <?php print $image; ?>
<?php } ?> <?php } ?>
</div> </div>
<div class="item"> <div class="item">
<a href="<?php print $object->url ?>"> <a href="<?php print $ting_url ?>">
<div class="info"> <div class="info">
<h3><?php print $object->title; ?></h3> <h3><?php print $ting_title; ?></h3>


<span class="author"> <?php if (!empty($ting_creators)) { ?>
<em><?php echo t('by'); ?></em> <span class="author">
<?php print $object->creators_string ?> <em><?php echo t('by'); ?></em>
</span> <?php print array_shift($ting_creators) ?>
<span class='date'><?php print $date; ?></span> </span>

<?php
// TODO: This should go into ting_availability.
if ($type != 'Netdokument') { ?>
<div><div class="ting-status waiting">Afventer data…</div></div>
<?php } ?> <?php } ?>


<div class='language'><?php echo t('Language') . ': ' . $language; ?></div> <span class='date'>(<?php print $ting_publication_date; ?>)</span>

<div>
<?php if (isset($additional_content)) { print drupal_render($additional_content); } ?>
</div>

<div class='language'><?php echo t('Language') . ': ' . $ting_language; ?></div>


<?php <?php
foreach ($additional_creators as $creator) { if (!empty($ting_creators)) {
print "<p>" . $creator . "</p>"; foreach ($ting_creators as $creator) {
print "<p>" . $creator . "</p>";
}
} }
?> ?>
</div> </div>
</a> </a>
</div> </div>
</div> </div>
</div> </div>
3 changes: 1 addition & 2 deletions templates/ting/ting-list.tpl.php
@@ -1,5 +1,4 @@
<?php <?php
// $Id$
/** /**
* @file * @file
* Display a list of ting objects. * Display a list of ting objects.
Expand All @@ -18,4 +17,4 @@
print $objects; print $objects;
} }
?> ?>
</div> </div>