Add the Slideshow region to Danland 7.x.

3 files changed, 41 insertions, 15 deletions

diff --git a/danland.info b/danland.info
index 7502f4a..8bfc9bc 100644
--- a/danland.info
+++ b/danland.info
@@ -7,6 +7,7 @@ stylesheets[all][] = style.css
 regions[search_box] = Search region
 regions[superfish_menu] = Superfish menu
 regions[page_top] = Page top
+regions[slideshow] = Slideshow
 regions[preface] = Preface top
 regions[highlighted] = Highlighted
 regions[preface_first] = Preface first
@@ -30,5 +31,4 @@ regions[page_bottom] = Page bottom
 core = "7.x"
 
 scripts[] = scripts/hoverIntent.js
-scripts[] = scripts/superfish.js
-
+scripts[] = scripts/superfish.js
\ No newline at end of file
diff --git a/page.tpl.php b/page.tpl.php
index f5b3623..75cd61f 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -63,6 +63,7 @@
  * Regions:
  * - $page['search_box']: Items for the search box.
  * - $page['superfish_menu']: Items for the superfish menu.
+ * - $page['slideshow']: Items for the slideshow.
  * - $page['preface']: Items for the preface top region / set only displayed on frontpage.
  * - $page['highlighted']: Items for the highlighted region.
  * - $page['preface_first']: Items for the preface first region.
@@ -166,13 +167,13 @@
 	<?php if($is_front): ?>
 		<div id="slideshow-wrapper">
 			<div class="slideshow-inner">
-				<div id="slideshow-preface">
-					<?php if ($page['preface']): ?>
+				<?php if ($page['preface']): ?>
+					<div id="slideshow-preface">
 						<div id="preface">
 							<?php print render ($page['preface']); ?>
 						</div> <!-- end preface -->
-					<?php endif; ?>
-				</div>
+					</div>
+				<?php endif; ?>
 				<?php if ($page['highlighted']) : ?>
 					<div id="slideshow-bottom">
 						<div id="mission">
@@ -180,11 +181,18 @@
 						</div>
 					</div> <!-- end mission / highlighted -->
 				<?php endif; ?>
-				<div class="slideshow">
-					<img src="<?php print $base_path . $directory; ?>/images/slideshows/sea.jpg" width="950" height="355" alt="slideshow 1"/>
-					<img src="<?php print $base_path . $directory; ?>/images/slideshows/noon.jpg" width="950" height="355" alt="slideshow 2"/>
-					<img src="<?php print $base_path . $directory; ?>/images/slideshows/snow.jpg" width="950" height="355" alt="slideshow 3"/>
-				</div> <!-- end slideshow -->
+				<?php if ($page['slideshow']) : ?>
+					<div class="slideshow">
+						<?php print render ($page['slideshow']); ?>
+					</div> <!-- end slideshow -->
+				<?php endif; ?>
+				<?php if (!$page['slideshow']) : ?>
+					<div class="slideshow">
+						<img src="<?php print $base_path . $directory; ?>/images/slideshows/sea.jpg" width="950" height="355" alt="slideshow 1"/>
+						<img src="<?php print $base_path . $directory; ?>/images/slideshows/noon.jpg" width="950" height="355" alt="slideshow 2"/>
+						<img src="<?php print $base_path . $directory; ?>/images/slideshows/snow.jpg" width="950" height="355" alt="slideshow 3"/>
+					</div> <!-- end slideshow -->
+				<?php endif; ?>
 			</div>
 		</div>
 	<?php endif; ?>
diff --git a/style.css b/style.css
index 97faf9a..d4ed5d7 100644
--- a/style.css
+++ b/style.css
@@ -44,10 +44,6 @@ margin-left: 10px;
 font-style:italic;
 }
 
-blockquote p {
-background: url(images/bq-br.gif) no-repeat right bottom;
-}
-
 cite {
 background: url(images/bq-tl.gif) no-repeat left top;
 clear: both;
@@ -475,6 +471,12 @@ z-index:2;
 overflow: hidden;
 }
 
+.slideshow .block-title {
+height: 0;
+overflow: hidden;
+position: absolute;
+}
+
 #preface {
 margin: 20px;
 font-size:1.2em;
@@ -835,6 +837,10 @@ font-weight:normal;
 padding-right:10px;
 }
 
+.field-type-taxonomy-term-reference {
+display:inline-block;
+}
+
 /* Comments
 -------------------------------------------------------------- */
 
@@ -910,6 +916,10 @@ color: #999;
 /* Forums
 -------------------------------------------------------------- */
 
+#forum {
+margin-bottom:20px;
+}
+
 #forum table {
 width: 100%;
 }
@@ -997,6 +1007,11 @@ background-color: #f4f4f4;;
 margin-bottom:10px;
 }
 
+.form-item, .form-actions {
+margin-bottom: 1em!important;
+margin-top: 1em!important;
+}
+
 /* Admin
 -------------------------------------------------------------- */
 
@@ -1315,6 +1330,9 @@ border:1px solid #bbb;
 margin-top:10px;
 }
 
+#user-login-form .openid-links li, #user-login .openid-links li {
+list-style-image: none!important;
+}
 
 /* Login + Register + RSS
 -------------------------------------------------------------- */