Added changes made by Jon Gos!

README.md

@@ -5,26 +5,24 @@ Sweeper is an intelligent media curation tool with filters for managing real-tim
 
 Find us on Github - [http://github.com/ushahidi/Swiftriver](http://github.com/ushahidi/Swiftriver)
 
-**NOTE**: This is a public beta software release for evaluation and feedback purposes only. Please do NOT use this in critical scenarios without further consultation. Contact jg [at] swiftly.org or mg [at] swiftly.org with additional questions or feedback.
+**NOTE**: This is still a beta software product. We recommend not using it in critical scenarios without further consultation. Contact us at support@swiftly.org with additional questions or feedback.
 
 RELEASE NOTES
 -------------
 This is the development branch of Sweeper for the upcoming V0.3 release.
 
-We plan to release Sweeper V0.3 on 28th Feb 2011.
+Some of the jazzy new features you can expect from this upcoming release are:
 
-Some of the Jazzy new features you can expect from this upcoming release are:
-
-* Tag based navigation of content
+* Tag-based navigation of content
 * Content grouping
-* Dash board
+* Dashboard Analytics
 
 
 DEVELOPER NOTES
 ---------------
 
 If you are a developer interested in contributing to Sweeper then there are a few things to note
-before you jump in and start coding.
+before you jump in and start coding. First be sure to read this overview - http://goo.gl/mlPff
 
 The **master** branch will always be the latest stable release of the app so unless you
 like living life dangerously this is the best place to start:

installer/Introduction.php

@@ -3,9 +3,8 @@ class Introduction implements IInstallStep
 {
     public function GetDescription()
     {
-        return "Welcome to the installer for SwiftRiver:Sweeper.".
-               "If you haven't already, check out the installation guide".
-               "on wiki.ushahidi.com.<br/> ".
+        return "Welcome to the installer for the SwiftRiver Sweeper application.".
+               " If you haven't already, check out the <a href='http://wiki.ushahidi.com'>installation guide</a>.<br />".
                "<a href='?position=1'><img src='assets/images/button-letsgetstarted.png' /></a>";
     }
 

installer/assets/styles/master.css

@@ -20,10 +20,10 @@ div#baloon { width: 390px; position:relative; top:-150px; left:110px;}
 div#baloon div.top { background: url('../images/baloon-top.png') no-repeat; height:28px; }
 div#baloon div.mid { background: url('../images/baloon-mid.png') repeat-y; padding:10px; }
 div#baloon div.mid h2 { width:100%; text-align:center; font-family:Calibri; font-size:3em; margin-bottom:15px; color:#333; }
-div#baloon div.mid p { text-align:justify; }
-div#baloon div.mid p.description { width:80%; margin-left:auto; margin-right:auto; font-family:Calibri; font-size:1.5em; margin-bottom:15px; }
+div#baloon div.mid p { text-align:none; }
+div#baloon div.mid p.description { width:80%; margin-left:auto; margin-right:auto; font-family:verdana; font-size:1.0em; margin-bottom:15px; }
 div#baloon div.mid div.step-render ul li { list-style:none; }
-div#baloon div.mid div.step-render ul li.pass { background: url('../images/sucess-small.png') no-repeat;}
+div#baloon div.mid div.step-render ul li.pass { background: url('../images/success-small.png') no-repeat;}
 div#baloon div.mid div.step-render ul li.fail { background: url('../images/fail-small.png') no-repeat;}
 div#baloon div.mid div.step-render ul li p.name { font-family:Calibri; font-size:1.5em; padding-top:5px; margin-bottom:5px; margin-left:50px; }
 div#baloon div.mid div.step-render ul li p.result { margin-left:50px; margin-bottom:15px; margin-right:30px; }

installer/index.php

@@ -64,7 +64,7 @@
                     <h2>Step: <?php echo($step->GetName()); ?></h2>
                     <p class="description"><?php echo($step->GetDescription()); ?></p>
                     <?php if($sucess === true) : ?>
-                        <img src="assets/images/sucess-large.png" />
+                        <img src="assets/images/success-large.png" />
                     <?php elseif ($sucess === false) : ?>
                         <img src="assets/images/fail-large.png" />
                     <?php endif; ?>

installer/steps/Environment.php

@@ -11,7 +11,7 @@ public function GetName()
     public function GetDescription()
     {
         return "In this step we will ensure that you have the required PHP version " .
-	               "running on your server and that the PHP plugins needed are installed.";
+	               "and that the PHP plugins needed are installed.";
     }
 
     public function RunChecks($postVar)

installer/steps/ReadWriteAccess.php

@@ -11,7 +11,7 @@ public function GetName()
     public function GetDescription() 
     {
         return "Let's make sure that you have the correct ".
-		       "file permissions for the files needed. ";
+		       "file permissions. ";
     }
 
     public function RunChecks($postVar)
@@ -48,7 +48,7 @@ public function RunChecks($postVar)
                                     is_writable(dirname(__FILE__)."/../../web/modules");
         $directoriesCheck->text = $directoriesCheck->result
                 ? "All the directories have the correct permissions."
-				                : "Thats a shame, one of the following directories are not writable: <br/>".
+				                : "Thats a shame, one of the following directories is not writable: <br/>".
                   "[root]/core/Configuration/ConfigurationFiles<br />".
                   "[root]/core/Modules<br />".
                   "[root]/core/Cache<br />".

web/application/views/config/content.php

@@ -8,6 +8,6 @@
         <dt>Source veracity:</dt>
             <dd><?php echo($_GET['score'] == "null" ? "Not yet rated" : $_GET['score']); ?></dd>
         <dt>Link:</dt>
-            <dd><a target="_blank" href="<?php echo $_GET['contentlink']; ?>"><?php echo $_GET['contentlink']; ?></a></dd>
+            <dd><?php echo $_GET['contentlink']; ?></dd>
     </dl>
 </div>

web/application/views/contentmenu/editor.php

@@ -12,22 +12,22 @@
         </li>
         <li>
             <a class="<?php echo($accurate_class); ?>" href="<?php echo(url::base()); ?>contentlist/get/accurate">
-                Accurate content
+                Accurate
             </a>
         </li>
         <li>
             <a class="<?php echo($inaccurate_class); ?>" href="<?php echo(url::base()); ?>contentlist/get/inaccurate">
-                Inaccurate content
+                Inaccurate
             </a>
         </li>
         <li>
             <a class="<?php echo($chatter_class); ?>" href="<?php echo(url::base()); ?>contentlist/get/chatter">
-                Cross talk
+                Crosstalk
             </a>
         </li>
         <li>
             <a class="<?php echo($irrelevant_class); ?>" href="<?php echo(url::base()); ?>contentlist/get/irrelevant">
-                Irrelevant content
+                Irrelevant
             </a>
         </li>
     </ul>

web/application/views/defaults/footer.php

@@ -1,2 +1,2 @@
 <?php ?>
-<p class="footnote">Sweeper v0.2.0 is released under the <a href="http://fsf.org/" title="GNU Lesser">GNU Lesser General Public License.</a> Powered by the <a href="http://swiftly.org" title="Swiftly.org">SwiftRiver platform</a>. <a href="http://wiki.ushahidi.com/doku.php?id=intro" title="SwiftRiver documentation">Documentation</a>. &copy; 2011 <a href="http://ushahidi.com" title="Ushahidi">Ushahidi, Inc LLC</a></p>
+<p class="footnote">Sweeper v0.3 is released under the <a href="http://fsf.org/" title="GNU Lesser">GNU Lesser General Public License.</a> Powered by <a href="http://swiftly.org" title="Swiftly.org">SwiftRiver</a>. &copy; 2011 <a href="http://ushahidi.com" title="Ushahidi">Ushahidi Inc. LLC</a>. | <a href="http://wiki.ushahidi.com/doku.php?id=intro" title="SwiftRiver Documentation">Documentation</a></p>

web/application/views/pages/dashboard.php

@@ -1,7 +1,7 @@
 <div id="dashboard">
     <div id="intro">
-        <h1>Welcome to Sweeper - a Swiftriver app!</h1>
-        <p>In 1972, a crack commando unit was sent to prison by a military court for a crime they didn't commit. They promptly escaped from a maximum security stockade to the Los Angeles underground. Today, still wanted by the government, they survive as soldiers of fortune. If you have a problem, if no-one else can help, and if you can find them, maybe you can hire the A-Team.</p>
+        <h1><i>Welcome to Sweeper, a Swiftly.org application!</i></h1>
+        <p>The mission of the SwiftRiver initiative is to democratize access to the tools used to make sense of realtime data. This app is designed to allow users to <em>sweep</em> through data feeds quickly, using conditional filters and views.</p><br />
     </div>
     <div class="row clearfix">
         <div class="column left">

web/media/js/site/framework.js

@@ -186,7 +186,7 @@ function ListController(baseUrl, subject, navContainer) {
                 else
                 {
                     $(listController.navContainer + " #selected-tags-container").children().remove();
-                    $(listController.navContainer + " #selected-tags-container").append("<h2>No tags selected</h2><p>you can click on a tag to see content that shares that tag</p>");
+                    $(listController.navContainer + " #selected-tags-container").append("<p>No tags selected. Click tags below to filter view by selection.</p>");
                 }
 
                 if(navigationTree.Channels != null && navigationTree.Channels.facets != null)

web/modules/riverid/classes/riveridconfig.php

@@ -2,9 +2,9 @@
 class RiverIdConfig
 {
     public static $databaseurl = 'localhost';
-    public static $username = 'sweeper';
-    public static $password = 'sweeper';
-    public static $database = 'sweeper';
+    public static $username = 'swiftriver';
+    public static $password = 'KU93uT';
+    public static $database = 'swiftriver';
 
     public static $createsql = "CREATE TABLE IF NOT EXISTS users ( username VARCHAR(2000), password VARCHAR(2000), role VARCHAR(2000) ) TYPE=innodb";
 }

web/modules/swiftrivertheming/classes/themingconfig.php

@@ -2,9 +2,9 @@
 class ThemingConfig
 {
     public static $databaseurl = 'localhost';
-    public static $username = 'sweeper';
-    public static $password = 'sweeper';
-    public static $database = 'sweeper';
+    public static $username = 'swiftriver';
+    public static $password = 'KU93uT';
+    public static $database = 'swiftriver';
 
     public static $createsql = "CREATE TABLE IF NOT EXISTS theming ( theme VARCHAR(2000) ) TYPE=innodb";
 }