From 1758ed453bcf2abd11bc2fde8768632099fe0de3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 27 Jan 2010 06:25:22 -0500
Subject: move UAP plugin to core

---
 theme/base/css/uap.css | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 theme/base/css/uap.css

(limited to 'theme/base/css/uap.css')

diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css
new file mode 100644
index 000000000..90abe5180
--- /dev/null
+++ b/theme/base/css/uap.css
@@ -0,0 +1,50 @@
+/** Universal Ad Package styles:
+ * Medium Rectangle 300x250
+ * Rectangle        180x150
+ * Leaderboard      728x90
+ * Wide Skyscraper  160x600
+ *
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+
+.ad {
+border:1px solid #CCC;
+float:left;
+}
+
+#ad_medium-rectangle {
+width:300px;
+height:250px;
+
+margin-left:1.35%;
+margin-bottom:18px;
+}
+
+#ad_rectangle {
+width:180px;
+height:150px;
+
+float:right;
+margin-right:18px;
+}
+
+#ad_leaderboard {
+width:728px;
+height:90px;
+
+margin:29px 18px 0 0;
+clear:both;
+}
+
+#ad_wide-skyscraper {
+width:160px;
+height:600px;
+
+margin-top:18px;
+margin-left:8.5%;
+}
-- 
cgit v1.2.3-54-g00ecf


From e3bd97bfe46ee7d063a45eec282b28faee1ca83f Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 27 Jan 2010 15:14:00 +0100
Subject: Aligning wide skyscraper to the right instead of left

---
 theme/base/css/uap.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'theme/base/css/uap.css')

diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css
index 90abe5180..b95e9b2ce 100644
--- a/theme/base/css/uap.css
+++ b/theme/base/css/uap.css
@@ -45,6 +45,7 @@ clear:both;
 width:160px;
 height:600px;
 
+float:right;
 margin-top:18px;
-margin-left:8.5%;
+margin-right:8.25%;
 }
-- 
cgit v1.2.3-54-g00ecf


From 1c875a53952506ca95716992511421d110a37d4d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 27 Jan 2010 15:32:59 +0100
Subject: Moved rectangle ad into aside and leaderboard to the right in header.
 Intention for this layout was to reduce whitespace in header area

---
 lib/uapplugin.php      | 15 ++++++++++++++-
 theme/base/css/uap.css |  9 ++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'theme/base/css/uap.css')

diff --git a/lib/uapplugin.php b/lib/uapplugin.php
index 4364b1e19..69b68f936 100644
--- a/lib/uapplugin.php
+++ b/lib/uapplugin.php
@@ -99,7 +99,7 @@ abstract class UAPPlugin extends Plugin
     }
 
     /**
-     * Add a leaderboard and/or rectangle in the header
+     * Add a leaderboard in the header
      *
      * @param Action $action Action being shown
      *
@@ -116,6 +116,19 @@ abstract class UAPPlugin extends Plugin
             $action->elementEnd('div');
         }
 
+        return true;
+    }
+
+    /**
+     * Add a rectangle before aside sections
+     *
+     * @param Action $action Action being shown
+     *
+     * @return boolean hook flag
+     */
+
+    function onStartShowSections($action)
+    {
         if (!is_null($this->rectangle)) {
             $action->elementStart('div',
                                   array('id' => 'ad_rectangle',
diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css
index b95e9b2ce..d7fa02c7f 100644
--- a/theme/base/css/uap.css
+++ b/theme/base/css/uap.css
@@ -29,15 +29,18 @@ margin-bottom:18px;
 width:180px;
 height:150px;
 
-float:right;
-margin-right:18px;
+float:none;
+clear:both;
+margin:0 auto;
+margin-bottom:29px;
 }
 
 #ad_leaderboard {
 width:728px;
 height:90px;
 
-margin:29px 18px 0 0;
+margin:11px 18px 0 0;
+float:right;
 clear:both;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 5e31ecd82aaf102382380b1352503303893cf9ba Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 27 Jan 2010 16:52:18 +0100
Subject: Centred leaderboard ad

---
 theme/base/css/uap.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'theme/base/css/uap.css')

diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css
index d7fa02c7f..73be5f0c1 100644
--- a/theme/base/css/uap.css
+++ b/theme/base/css/uap.css
@@ -39,8 +39,8 @@ margin-bottom:29px;
 width:728px;
 height:90px;
 
-margin:11px 18px 0 0;
-float:right;
+margin:0 auto 18px;
+float:none;
 clear:both;
 }
 
-- 
cgit v1.2.3-54-g00ecf