Classification

CHANGELOG.md

@@ -1,3 +1,39 @@
+### 1.1.47 (2016-10-26)
+
+
+#### Bug Fixes
+
+* **Carousel:**
+  * Added newline because github was complaining #726 ([17fff233](https://github.com/ozone-development/ozp-center.git/commit/17fff2335a8c1aae010ac81bbe503d04420a7dba))
+  * Forgot new style sheet #726 ([9c54020d](https://github.com/ozone-development/ozp-center.git/commit/9c54020d312834bdb6a0f61232f3431e1ea9803b))
+  * Fixed styling for new listings so they don't appear out of the list #726 ([edab8279](https://github.com/ozone-development/ozp-center.git/commit/edab8279ccf7bf3e84774090edbcf1f285225f06))
+* **carousel:** correcting previous style change which prevented carousel animation ([de43acaf](https://github.com/ozone-development/ozp-center.git/commit/de43acafa01e7f76200e37758934a6d9c14d6f47))
+
+
+### 1.1.46 (2016-10-20)
+
+
+### 1.1.45 (2016-10-05)
+
+
+#### Bug Fixes
+
+* **Carousel:** Fixed arrows disappearing when tabbing into carousel #524 ([cedc7910](https://github.com/ozone-development/ozp-center.git/commit/cedc79100c1941c77d81e063c6197c59540a029b))
+* **reviews:** Changed variable name and text to reflect that reviews are not to be above FOUO  ([88e0dc90](https://github.com/ozone-development/ozp-center.git/commit/88e0dc90918dc7c3207451056c595a519b349175))
+
+
+### 1.1.44 (2016-09-21)
+
+
+### 1.1.43 (2016-09-09)
+
+
+#### Bug Fixes
+
+* centerTour.js ([e7e7da77](https://github.com/ozone-development/ozp-center.git/commit/e7e7da77f91936050eeb5080f5e5a136d0062a5d))
+* new code to redirect at end of center tour ([e69f8853](https://github.com/ozone-development/ozp-center.git/commit/e69f88539aa2cd6d12d83fdc6d5d33a0965642c6))
+
+
 ### 1.1.42 (2016-09-01)
 
 

app/js/analytics/ozp-analytics.js

@@ -1,35 +1,41 @@
 'use strict';
 
+var pushEvent = function(event) {
+    if (window._paq) {
+        window._paq.push(event);
+    }
+};
+
 module.exports = {
     trackEvent: function (label, data, agency) {
-        window._paq.push(['trackEvent', label, data, agency]);
+        pushEvent(['trackEvent', label, data, agency]);
     },
 
     trackCategorization: function (label, category, total) {
-        window._paq.push(['trackEvent', label, category, total]);
+        pushEvent(['trackEvent', label, category, total]);
     },
 
     trackSiteSearch: function (label, query, total) {
         query = query.toLowerCase();
-        window._paq.push(['trackSiteSearch', query, label, total]);
+        pushEvent(['trackSiteSearch', query, label, total]);
     },
 
     trackListingCreation: function(listingName, agency){
-        window._paq.push(['trackEvent', 'Listing Creation', listingName, agency]);
+        pushEvent(['trackEvent', 'Listing Creation', listingName, agency]);
     },
 
     trackListingOrgApproval: function(listingName, agency){
-        window._paq.push(['trackEvent', 'Listing Org Approval', listingName, agency]);
+        pushEvent(['trackEvent', 'Listing Org Approval', listingName, agency]);
     },
     trackListingApproval: function(listingName, agency){
-        window._paq.push(['trackEvent', 'Listing Approval', listingName, agency]);
+        pushEvent(['trackEvent', 'Listing Approval', listingName, agency]);
     },
 
     trackListingReview: function(listingName, agency){
-        window._paq.push(['trackEvent', 'Listing Review', listingName, agency]);
+        pushEvent(['trackEvent', 'Listing Review', listingName, agency]);
     },
 
     trackListingReviewView: function(listingName, agency){
-        window._paq.push(['trackEvent', 'Listing Review View', listingName, agency]);
+        pushEvent(['trackEvent', 'Listing Review View', listingName, agency]);
     }
 };

app/js/components/NavBar/index.jsx

@@ -51,7 +51,9 @@ var NavBar = React.createClass({
                         <ul className="nav navbar-nav">
                             <li id="tourstop-hud" className="tooltiped" data-toggle="tooltip" data-placement="bottom" title="HUD"><a className="lrg" href={HUD_URL}><i className="icon-home-grayLightest"></i><span className="hidden-span">HUD</span></a></li>
                             <li id="tourstop-center" className="active tooltiped" data-toggle="tooltip" data-placement="bottom" title="Center"><a className="lrg" href='#/home' ><i className="icon-shopping-grayLightest activeIcon"></i><span className="hidden-span">Center</span></a></li>
-                            <li id="tourstop-webtop" className="tooltiped" data-toggle="tooltip" data-placement="bottom" title="Webtop"><a className="lrg" href={WEBTOP_URL}><i className="icon-layout-grayLightest"></i><span className="hidden-span">Webtop</span></a></li>
+                            { !secondParty &&
+                              <li id="tourstop-webtop" className="tooltiped" data-toggle="tooltip" data-placement="bottom" title="Webtop"><a className="lrg" href={WEBTOP_URL}><i className="icon-layout-grayLightest"></i><span className="hidden-span">Webtop</span></a></li>
+                            }
                         </ul>
                     </div>
 

app/js/components/carousel/index.jsx

@@ -32,9 +32,9 @@ var Carousel = React.createClass({
                         { this.props.children }
                     </ul>
                     <div className="clearfix"></div>
-                    <button className="prev btn hidden" href="#" ref="prev" aria-label="previous carousel button"><i className="icon-caret-left-white" alt=""></i></button>
-                    <button className="next btn hidden" href="#" ref="next" aria-label="next carousel button"><i className="icon-caret-right-white" alt=""></i></button>
                 </div>
+                <button className="prev btn hidden" href="#" ref="prev" aria-label="previous carousel button"><i className="icon-caret-left-white" alt=""></i></button>
+                <button className="next btn hidden" href="#" ref="next" aria-label="next carousel button"><i className="icon-caret-right-white" alt=""></i></button>
             </div>
         );
     },

app/js/components/createEdit/validation/listing.js

@@ -44,7 +44,7 @@ var securityMarking = NonBlankString(200),
     type = NonBlankString(50),
     whatIsNew = maybe(StringMax(255)),
     categories = list(NonBlankString(50)),
-    tags = list(StringMax(16)),
+    tags = list(StringMax(30)),
     intents = list(NonBlankString(127)),
     screenshots = list(Screenshot),
     contacts = list(Contact),

app/js/components/quickview/DetailsTab.jsx

@@ -71,7 +71,7 @@ var DetailsTab = React.createClass({
                             <p className="forceWrap"><label>URL:</label><span> <a className="forceWrap" href={URL}>{ URL }</a></span></p>
 
                             <p><label>Categories:</label><span> { categories ? categories : <EmptyFieldValue inline /> }</span></p>
-                            <p><label>Tags:</label><span> {this.renderTags(this) }</span></p>
+                            <p className="forceWrap"><label>Tags:</label><span> {this.renderTags(this) }</span></p>
                             <p><label>Last Updated:</label><span> { updatedDate }</span></p>
                             <p><label>Version Number:</label><span> { versionNumber } </span></p>
                         </p>

app/js/components/quickview/reviews/EditReview.jsx

@@ -3,7 +3,7 @@
 var React = require('react');
 var { classSet } = React.addons;
 var Reflux = require('reflux');
-var SystemHighMessage = require('../../shared/SystemHighMessage.jsx');
+var ReviewWarningMessage = require('../../shared/ReviewWarningMessage.jsx');
 var _ = require('../../../utils/_');
 var IconRating = require('../../shared/IconRating.jsx');
 var PopoverConfirmationButton = require('./../../shared/PopoverConfirmationButton.jsx');
@@ -122,7 +122,7 @@ var EditReview = React.createClass({
                 </div>
                 <div className={hasError}>
                     <h6>Description</h6>
-                    <SystemHighMessage />
+                    <ReviewWarningMessage />
                     {isEditingRateAllowed &&
                     <textarea ref="text" value={ text } onChange={ this.onTextChange }></textarea>
                     }

app/js/components/quickview/reviews/SubmitReview.jsx

@@ -2,7 +2,7 @@
 
 var React = require('react');
 var { classSet } = React.addons;
-var SystemHighMessage = require('../../shared/SystemHighMessage.jsx');
+var ReviewWarningMessage = require('../../shared/ReviewWarningMessage.jsx');
 var _ = require('../../../utils/_');
 var IconRating = require('../../shared/IconRating.jsx');
 var ListingActions = require('../../../actions/ListingActions');
@@ -71,7 +71,7 @@ var ReviewListing = React.createClass({
                 </div>
                 <div className={hasError}>
                     <h6>Description</h6>
-                    <SystemHighMessage />
+                    <ReviewWarningMessage />
                     <textarea ref="text" value={ text } onChange={ this.onTextChange }></textarea>
                     <p className="help-block small">Must have more than {limit} characters</p>
                 </div>

app/js/components/shared/ReviewWarningMessage.jsx

@@ -0,0 +1,16 @@
+'use strict';
+
+var React = require('react');
+var { reviewWarningMessage } = require('ozp-react-commons/constants/messages');
+
+var ReviewWarningMessage = React.createClass({
+
+    render: function () {
+        return (
+            <p className="alert alert-warning">{reviewWarningMessage}</p>
+        );
+    }
+
+});
+
+module.exports = ReviewWarningMessage;

app/js/main.js

@@ -18,9 +18,10 @@ var SelfStore = require('ozp-react-commons/stores/SelfStore');
 var ProfileActions = require('ozp-react-commons/actions/ProfileActions');
 var LoadError = require('ozp-react-commons/components/LoadError.jsx');
 var {
-  METRICS_URL,
+  API_URL,
   APP_TITLE,
-  IE_REDIRECT_URL
+  IE_REDIRECT_URL,
+  SYSTEM_HIGH_CLASSIFICATION
 } = require('ozp-react-commons/OzoneConfig');
 
 
@@ -35,11 +36,44 @@ require('script!bootstrap-classify');
 window.moment = require('moment');
 window.Tether = require('tether');
 
+var getCookie = function(cookieName) {
+    var cookieValue = null;
+
+    if (document.cookie && document.cookie !== '') {
+        var cookies = document.cookie.split(';');
+
+        $.each(cookies, function(index, cookie) {
+            var cookie = $.trim(cookie);
+
+            // Does this cookie string begin with the cookieName we want?
+            if (cookie.substring(0, cookieName.length + 1) === (cookieName + '=')) {
+                cookieValue = decodeURIComponent(cookie.substring(cookieName.length + 1));
+
+                // Returning false breaks out of $.each
+                return false;
+            }
+        });
+    }
+
+    return cookieValue;
+};
+
 // Enable withCredentials for all requests
-$.ajaxPrefilter(function (options) {
+$.ajaxPrefilter(function (options, originalOptions, jqXHR) {
     options.xhrFields = {
         withCredentials: true
     };
+
+    var requestType = options['type'].toLowerCase();
+    if (requestType === 'post' || requestType === 'delete') {
+        jqXHR.setRequestHeader('X-CSRFToken', getCookie('csrftoken'));
+    }
+});
+
+$(document).ajaxError(function (event, jqxhr, settings, thrownError ) {
+    if (settings.url.indexOf('/api/') >= 0 && thrownError === 'FORBIDDEN') {
+        window.location = API_URL + '/accounts/login/';
+    }
 });
 
 var Routes = require('./components/Routes.jsx'),
@@ -50,6 +84,15 @@ var Routes = require('./components/Routes.jsx'),
  * Render everything when we get our profile
  */
 SelfStore.listen(_.once(function(profileData) {
+
+    // Classification needs to run after the profileData is loaded
+    $(function() {
+        $(document).classification({
+            level: SYSTEM_HIGH_CLASSIFICATION,
+            colorBanners: true
+        });
+    });
+
     Router.run(routes, function (Handler) {
         var main = document.getElementById('main'),
             component;
@@ -67,38 +110,6 @@ SelfStore.listen(_.once(function(profileData) {
 
 ProfileActions.fetchSelf();
 
-(function initPiwik() {
-    var _paq = window._paq || [];
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-
-    (function() {
-        var d = document,
-            g = d.createElement('script'),
-            s = d.getElementsByTagName('script')[0],
-            u = METRICS_URL;
-
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', 1]);
-
-        g.type='text/javascript';
-        g.async=true;
-        g.defer=true;
-        g.src=u+'piwik.js';
-        s.parentNode.insertBefore(g,s);
-    })();
-
-    window._paq = _paq;
-})();
-
-// Classification
-$(function() {
-    $(document).classification({
-        level: 'U'
-    });
-});
-
-
 require('tour');
 require('./tour/tour.js');