updates

builders · Jul 17, 2012 · 33fad92 · 33fad92
1 parent 0f659cc
commit 33fad92
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 24 deletions.
diff --git a/www/httpdocs/workspace/data-sources/data.alerts_global.php b/www/httpdocs/workspace/data-sources/data.alerts_global.php
@@ -4,6 +4,7 @@
 
 	Class datasourcealerts_global extends Datasource{
 
+		public $dsParamCACHE = '0';
 		public $dsParamROOTELEMENT = 'alerts-global';
 		public $dsParamORDER = 'desc';
 		public $dsParamPAGINATERESULTS = 'no';
@@ -22,7 +23,8 @@
 		public $dsParamINCLUDEDELEMENTS = array(
 				'url',
 				'content: formatted',
-				'can-be-closed'
+				'can-be-closed',
+				'show-everywhere'
 		);
 
 
@@ -35,11 +37,11 @@ public function about(){
 			return array(
 				'name' => 'Alerts: Global',
 				'author' => array(
-					'name' => 'Kirk Strobeck',
-					'website' => 'http://72.10.33.203',
-					'email' => 'kirk@strobeck.com'),
+					'name' => 'Jonathan Simcoe',
+					'website' => 'http://atheycreek',
+					'email' => 'jdsimcoe@gmail.com'),
 				'version' => 'Symphony 2.2.5',
-				'release-date' => '2012-05-25T00:39:55+00:00'
+				'release-date' => '2012-07-17T21:33:53+00:00'
 			);
 		}
 

diff --git a/www/httpdocs/workspace/data-sources/data.events_recurring_entry_by_id.php b/www/httpdocs/workspace/data-sources/data.events_recurring_entry_by_id.php
@@ -4,6 +4,7 @@
 
 	Class datasourceevents_recurring_entry_by_id extends Datasource{
 
+		public $dsParamCACHE = '0';
 		public $dsParamROOTELEMENT = 'events-recurring-entry-by-id';
 		public $dsParamORDER = 'desc';
 		public $dsParamPAGINATERESULTS = 'yes';
@@ -35,6 +36,7 @@
 				'locations: longitude',
 				'downloads: name',
 				'downloads: file',
+				'downloads: link',
 				'images: image',
 				'text: content',
 				'verses: passage',
@@ -59,11 +61,11 @@ public function about(){
 			return array(
 				'name' => 'Events: Recurring: Entry by ID',
 				'author' => array(
-					'name' => 'Kirk Strobeck',
-					'website' => 'http://72.10.33.203',
-					'email' => 'kirk@strobeck.com'),
+					'name' => 'Jonathan Simcoe',
+					'website' => 'http://atheycreek',
+					'email' => 'jdsimcoe@gmail.com'),
 				'version' => 'Symphony 2.2.5',
-				'release-date' => '2012-06-22T19:38:40+00:00'
+				'release-date' => '2012-07-17T20:51:47+00:00'
 			);
 		}
 

diff --git a/www/httpdocs/workspace/themes/active/css/common.css b/www/httpdocs/workspace/themes/active/css/common.css
diff --git a/www/httpdocs/workspace/themes/active/less/common.less b/www/httpdocs/workspace/themes/active/less/common.less
@@ -512,27 +512,30 @@ h3 {
 }
 
 .alert {
-	.box-shadow(0 1px 2px rgba(0,0,0,0.1));
+		#font > #tisa > .regular;
+		margin: @base * 2 0;
+	// .box-shadow(0 1px 2px rgba(0,0,0,0.1));
 
-	border: 1px solid lighten(#468847, 25%);
-	letter-spacing: 1px;
-	line-height: 1.2;
+	// border: 1px solid lighten(#468847, 25%);
+	// letter-spacing: 1px;
+	// line-height: 1.2;
 
 	&.alertLive {
 		margin-top: @base * 3;
 	}
 
 	strong {
 		#font > #proxima > .bold;
-		display: inline-block;
 		text-transform: uppercase;
-		padding-top: 7px;
-		margin-right: @base;
+		// display: inline-block;
+		// text-transform: uppercase;
+		// padding-top: 7px;
+		// margin-right: @base;
 	}
 
-	.btn {
-		margin-bottom: 2px;
-	}
+	// .btn {
+	// 	margin-bottom: 2px;
+	// }
 }
 
 .navbar {

diff --git a/www/httpdocs/workspace/themes/active/xsl/alerts.xsl b/www/httpdocs/workspace/themes/active/xsl/alerts.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+
+<xsl:template name="component-alerts">
+
+    <xsl:param name="component" select="'alerts'" />
+    <xsl:param name="entries" />
+
+    <xsl:if test="count($entries)">
+
+        <div class="alert">
+            <xsl:call-template name="class-rows" />
+
+            <xsl:for-each select="$entries">
+                <xsl:if test="can-be-closed">
+                    <a class="close" data-dismiss="alert">×</a>
+                </xsl:if>
+
+                <xsl:value-of select="content" disable-output-escaping="yes" />
+
+            </xsl:for-each>
+
+        </div>
+
+    </xsl:if>
+
+</xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/www/httpdocs/workspace/themes/active/xsl/template.xsl b/www/httpdocs/workspace/themes/active/xsl/template.xsl
@@ -121,7 +121,8 @@
 	</div>
 	<div class="header mast" id="overview">
 		<div class="container">
-			<xsl:call-template name="alerts" />
+			<!-- <xsl:call-template name="alerts" /> -->
+			<!-- <xsl:call-template name="component-alerts" /> -->
 			<div class="row">
 				<div class="span12">
 					<a href="{$root}" class="logo">

diff --git a/www/httpdocs/workspace/utilities/alerts.xsl b/www/httpdocs/workspace/utilities/alerts.xsl
@@ -14,7 +14,10 @@
 		</div>
 	</xsl:if>
 
-</xsl:template>
+    <xsl:call-template name="component-alerts">
+        <xsl:with-param name="entries" select="//alerts-entries-by-tag/entry" />
+    </xsl:call-template>
 
+</xsl:template>
 
 </xsl:stylesheet>
diff --git a/www/httpdocs/workspace/utilities/components.xsl b/www/httpdocs/workspace/utilities/components.xsl
@@ -11,6 +11,7 @@
 <xsl:include href="../themes/active/xsl/spacer.xsl" />
 <xsl:include href="../themes/active/xsl/teachings.xsl" />
 <xsl:include href="../themes/active/xsl/text.xsl" />
+<xsl:include href="../themes/active/xsl/alerts.xsl" />
 <xsl:include href="../themes/active/xsl/verses.xsl" />
 <xsl:include href="../themes/active/xsl/videos.xsl" />
 
@@ -209,6 +210,12 @@
 				<xsl:with-param name="entries" select="//text-entries-by-tag/entry" />
 			</xsl:call-template>
 		</xsl:if>
+		<xsl:if test=". = 'alerts'">
+			<xsl:call-template name="component-alerts">
+<!--  				<xsl:with-param name="position" select="name($xpath)" /> -->
+				<xsl:with-param name="entries" select="//alerts-entries-by-tag/entry" />
+			</xsl:call-template>
+		</xsl:if>
 		<xsl:if test=". = 'verses'">
 			<xsl:call-template name="component-verses">
 				<xsl:with-param name="position" select="name($xpath)" />