Merge branch 'master' of github.com:brianking/ReMo-Helper

NEWS

@@ -1,6 +1,20 @@
 For a more comprehensive changelog of the latest experimental code, see:
         https://github.com/brianking/ReMo-Helper/commits/
 
+1.0 (2012-05-10)
+ First ublic release
+
+ No changes
+
+1.0b1 (2012-05-04)
+ Beta release
+
+ General:
+   - General cleanup, mostly to first-run page
+
+ Reports
+   - Changed URL for submitting a report to profile page while we wait for the current report URL to be ready
+
 0.3 (2012-04-19)
  Visual:
    - Changed look and feel to be more like reps.mozilla.org

README.md

@@ -1,6 +1,6 @@
 This is the ReMo Companion add-on. You can build it with the Add-ons SDK,
 available for download at:
-https://addons.mozilla.org/en-US/developers/builder 
+https://addons.mozilla.org/developers/builder 
 
 Source Code
 ===========

data/foundation/stylesheets/app.css

@@ -22,58 +22,6 @@
 :: Reports Styles
 */
 
-
-/* -----------------------------------------
-   Fonts
------------------------------------------ */
-
-@font-face {
-    font-family: 'MetaBlack';
-    src: url('/media/fonts/MetaWebPro-Black.eot');
-    src: local('☺'), url('/media/fonts/MetaWebPro-Black.woff') format('woff');
-    font-weight: bold;
-}
-
-@font-face {
-    font-family: 'MetaNormal';
-    src: local('☺'), url('/media/fonts/MetaWebPro-Normal.woff') format('woff');
-    font-weight: bold;
-}
-
-@font-face {
-    font-family: 'ModernPictogramsNormal';
-    src: url('/media/fonts/modernpics-webfont.eot');
-    src: url('/media/fonts/modernpics-webfont.eot?#iefix') format('embedded-opentype'),
-         url('/media/fonts/modernpics-webfont.woff') format('woff'),
-         url('/media/fonts/modernpics-webfont.ttf') format('truetype'),
-         url('/media/fonts/modernpics-webfont.svg#ModernPictogramsNormal') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('//www.mozilla.org/img/fonts/OpenSans-Regular-webfont.eot');
-    src: url('//www.mozilla.org/img/fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('//www.mozilla.org/img/fonts/OpenSans-Regular-webfont.woff') format('woff'),
-         url('//www.mozilla.org/img/fonts/OpenSans-Regular-webfont.ttf') format('truetype'),
-         url('//www.mozilla.org/img/fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg');
-    font-weight: 400;
-    font-style: normal;
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('//www.mozilla.org/img/fonts/OpenSans-Semibold-webfont.eot');
-    src: url('//www.mozilla.org/img/fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('//www.mozilla.org/img/fonts/OpenSans-Semibold-webfont.woff') format('woff'),
-         url('//www.mozilla.org/img/fonts/OpenSans-Semibold-webfont.ttf') format('truetype'),
-         url('//www.mozilla.org/img/fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg');
-    font-weight: 600;
-    font-style: normal;
-}
-
 /* -----------------------------------------
    Shared Styles
 ----------------------------------------- */

data/remo-start.html

@@ -73,30 +73,26 @@
         <div class="container">
             <!-- Header -->
             <header class="row">
-                <div class="twelve columns">
-
                 <!-- Logo & Navigation -->
                 <div class="row">
 
                   <!-- Logo and Wordmark -->
-                  <div class="four columns" id="logo-box">
+                  <div class="twelve columns" id="logo-box">
                     <div class="row hide-on-phones">
-                      <a href="/">
                         <img src="Remo64.png"
                              alt="Mozilla Reps logo">
                         <h3>
                             Mozilla Reps Companion &nbsp;|&nbsp;
                             <span id="version"/>
                         </h3>
-                      </a>
                     </div>
                     <div class="row show-on-phones">
                       <h2>Mozilla Reps Companion mobile</h2>
                     </div>
                   </div>
-                </div>
 
                 </div>
+
             </header>
 
             <!-- Separator -->
@@ -149,25 +145,37 @@ <h5>
 
         </div> <!-- end container div -->
 
-        <!-- Footer -->
-        <div id="footer" class="hide-on-phones">
-            <div class="row">
-                <hr />
+    </div> <!-- end Wrapper -->
+
+    <div class="row">
+        <hr />
+    </div>
+
+    <!-- Footer -->
+    <footer id="colophon">
+        <div class="row">
+            <div class="four columns">
+                <a target="_blank" href="http://mozilla.org" class="footer-logo">
+                    <img src="img/footer-mozilla.png" alt="mozilla">
+                </a>
             </div>
-            <div id="footer-contents">
-                <img id="footer-logo" src="remo_avatar.png" alt="Reps Logo gray">
-                <p id="footer-links">
+            <div class="four columns">
+                <p>
                     This Source Code Form is subject to the terms of the Mozilla Public
                     License, v. 2.0. You can obtain one a copy at <a target="_blank" href="http://mozilla.org/MPL/2.0/">http://mozilla.org/MPL/2.0/</a>.
                 </p>
             </div>
+            <div class="four columns">
+                <a target="_blank" href="https://reps.mozilla.org" class="footer-logo">
+                    <img id="footer-logo" src="img/remo_avatar.png" alt="Reps Logo gray">
+                </a>
+            </div>
         </div>
+    </footer>
 
-        <div class="addonbarhelper">
-            <p>Access to the Mozilla Reps Companion is always available via the <span style="font-weight: bold;"/>Add-on Bar</span>. Alternatively, via the Firefox <span style="font-weight: bold;"/>'Customize...'</span> feature, you can drag it into another toolbar.</p>
+    <div class="addonbarhelper">
+        <p>Access to the Mozilla Reps Companion is always available via the <span style="font-weight: bold;"/>Add-on Bar</span>. Alternatively, via the Firefox <span style="font-weight: bold;"/>'Customize...'</span> feature, you can drag it into another toolbar.</p>
             <div class="down-triangle"> </div>
-        </div>
-
     </div>
 
 </body>

data/remo.html

@@ -99,7 +99,7 @@ <h2><img src="Remo32.png" style="vertical-align: middle; padding: 0 0.5em;"/>Moz
               <ul>
                 <li>
                   <i class="icon-large icon-pencil"></i>
-                  <a target="_blank" href="https://reps.mozilla.org/me/currentreport/">Submit a new report</a>
+                  <a target="_blank" href="https://reps.mozilla.org/people/me/">Submit a new report</a>
                 </li>
               </ul>
               <p>Reporting back on a regular basis is a crucial part of your role as a Mozilla Rep. This involves documenting and sharing all your activities in the past month so that your mentor can see your progress and support you where needed, but also so that the broader community can have full visibility on all the amazing work that you are doing. To this end, a very simple Monthly Report form was developed to enable Mozilla Reps to report back easily, quickly, and efficiently.</p>

lib/main.js

@@ -15,7 +15,7 @@ var myworker = null;
 
 var sops = null;
 
-// disable debug logging for AMO
+// disable debug logging for releases
 //var console = new function() {}; console.debug = function() {};
 
 var panel = require("panel").Panel({
@@ -102,7 +102,6 @@ var listOfSOPs = Request({
 
 var getSOPs = function()
 {
-    console.debug("Retrieving SOPs...");
     listOfSOPs.get();
 }
 

package.json

@@ -3,11 +3,12 @@
     "name": "remo-companion", 
     "fullName": "Mozilla Reps Companion", 
     "contributors": [
+        "Brian King (https://reps.mozilla.org/u/brianking/)",
         "Vlad Florin Maniac"
     ], 
-    "author": "Brian King", 
-    "description": "Easy access to tools and documentation for Mozilla Reps", 
-    "version": "0.3", 
+    "author": "Mozilla", 
+    "description": "Easy access to tools, documentation, and more for Mozilla Reps", 
+    "version": "1.0", 
     "id": "jid1-4QxcVDv2lBVyfQ", 
     "icon": "data/Remo48.png",
     "icon64": "data/Remo64.png",