Merge pull request #2071 from akvo/#1966-results-frontend

[#1966] Editor headings fix and project page link fixed
akvo · Mar 31, 2016 · 6d623df · 6d623df
2 parents 276100a + 24f65b4
commit 6d623df
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 24 deletions.
diff --git a/akvo/rsr/static/scripts-src/my-results.js b/akvo/rsr/static/scripts-src/my-results.js
@@ -1504,11 +1504,20 @@ function initReact() {
             for (var parProjectId in result.parent_project) {
                 if (result.parent_project.hasOwnProperty(parProjectId)) {
                     var parProjectTitle = result.parent_project[parProjectId];
-                    var parNode = React.DOM.div( {className:"indicator-period-list parentProject"}, 
-                        React.DOM.span( {className:"relatedInfo"}, 
-                            i18nResults.parent_project,": ", React.DOM.a( {href:language + "/myrsr/results/" + parProjectId + "/"}, parProjectTitle)
-                        )
-                    );
+                    var parNode;
+                    if (isPublic) {
+                        parNode = React.DOM.div( {className:"indicator-period-list parentProject"}, 
+                            React.DOM.span( {className:"relatedInfo"}, 
+                                i18nResults.parent_project,": ", React.DOM.a( {href:language + "/project/" + parProjectId + "/#results"}, parProjectTitle)
+                            )
+                        );
+                    } else {
+                        parNode = React.DOM.div( {className:"indicator-period-list parentProject"}, 
+                            React.DOM.span( {className:"relatedInfo"}, 
+                                i18nResults.parent_project,": ", React.DOM.a( {href:language + "/myrsr/results/" + parProjectId + "/"}, parProjectTitle)
+                            )
+                        );
+                    }
                     parentsAndChildren.push(parNode);
                 }
             }
@@ -1517,11 +1526,20 @@ function initReact() {
             for (var childProjectId in result.child_projects) {
                 if (result.child_projects.hasOwnProperty(childProjectId)) {
                     var childProjectTitle = result.child_projects[childProjectId];
-                    var childNode = React.DOM.div( {className:"indicator-period-list childProject"}, 
-                        React.DOM.span( {className:"relatedInfo"}, 
-                            i18nResults.child_project,": ", React.DOM.a( {href:language + "/myrsr/results/" + childProjectId + "/"}, childProjectTitle)
-                        )
-                    );
+                    var childNode;
+                    if (isPublic) {
+                        childNode = React.DOM.div( {className:"indicator-period-list childProject"}, 
+                            React.DOM.span( {className:"relatedInfo"}, 
+                                i18nResults.child_project,": ", React.DOM.a( {href:language + "/project/" + childProjectId + "/#results"}, childProjectTitle)
+                            )
+                        );
+                    } else {
+                        childNode = React.DOM.div( {className:"indicator-period-list childProject"}, 
+                            React.DOM.span( {className:"relatedInfo"}, 
+                                i18nResults.child_project,": ", React.DOM.a( {href:language + "/myrsr/results/" + childProjectId + "/"}, childProjectTitle)
+                            )
+                        );
+                    }
                     parentsAndChildren.push(childNode);
                 }
             }

diff --git a/akvo/rsr/static/scripts-src/my-results.jsx b/akvo/rsr/static/scripts-src/my-results.jsx
@@ -1504,11 +1504,20 @@ function initReact() {
             for (var parProjectId in result.parent_project) {
                 if (result.parent_project.hasOwnProperty(parProjectId)) {
                     var parProjectTitle = result.parent_project[parProjectId];
-                    var parNode = <div className="indicator-period-list parentProject">
-                        <span className="relatedInfo">
-                            {i18nResults.parent_project}: <a href={language + "/myrsr/results/" + parProjectId + "/"}>{parProjectTitle}</a>
-                        </span>
-                    </div>;
+                    var parNode;
+                    if (isPublic) {
+                        parNode = <div className="indicator-period-list parentProject">
+                            <span className="relatedInfo">
+                                {i18nResults.parent_project}: <a href={language + "/project/" + parProjectId + "/#results"}>{parProjectTitle}</a>
+                            </span>
+                        </div>;
+                    } else {
+                        parNode = <div className="indicator-period-list parentProject">
+                            <span className="relatedInfo">
+                                {i18nResults.parent_project}: <a href={language + "/myrsr/results/" + parProjectId + "/"}>{parProjectTitle}</a>
+                            </span>
+                        </div>;
+                    }
                     parentsAndChildren.push(parNode);
                 }
             }
@@ -1517,11 +1526,20 @@ function initReact() {
             for (var childProjectId in result.child_projects) {
                 if (result.child_projects.hasOwnProperty(childProjectId)) {
                     var childProjectTitle = result.child_projects[childProjectId];
-                    var childNode = <div className="indicator-period-list childProject">
-                        <span className="relatedInfo">
-                            {i18nResults.child_project}: <a href={language + "/myrsr/results/" + childProjectId + "/"}>{childProjectTitle}</a>
-                        </span>
-                    </div>;
+                    var childNode;
+                    if (isPublic) {
+                        childNode = <div className="indicator-period-list childProject">
+                            <span className="relatedInfo">
+                                {i18nResults.child_project}: <a href={language + "/project/" + childProjectId + "/#results"}>{childProjectTitle}</a>
+                            </span>
+                        </div>;
+                    } else {
+                        childNode = <div className="indicator-period-list childProject">
+                            <span className="relatedInfo">
+                                {i18nResults.child_project}: <a href={language + "/myrsr/results/" + childProjectId + "/"}>{childProjectTitle}</a>
+                            </span>
+                        </div>;
+                    }
                     parentsAndChildren.push(childNode);
                 }
             }

diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css
@@ -2054,7 +2054,8 @@ body.translationBarActive div.skiptranslate ~ #map {
 
 .formProgress .panel-heading {
   cursor: pointer;
-  transition: background 0.1s linear; }
+  transition: background 0.1s linear;
+  padding: 0 15px 15px 15px; }
   .formProgress .panel-heading:hover {
     background: rgba(92, 184, 92, 0.1); }
 
@@ -2087,7 +2088,8 @@ body.translationBarActive div.skiptranslate ~ #map {
 
 .formOverviewInfo .panel-heading {
   cursor: pointer;
-  transition: background 0.1s linear; }
+  transition: background 0.1s linear;
+  padding: 0 15px 15px 15px; }
   .formOverviewInfo .panel-heading:hover {
     background: rgba(114, 205, 255, 0.1); }
 
@@ -2151,7 +2153,7 @@ body.translationBarActive div.skiptranslate ~ #map {
   .projectEdit .formStep .section-progress {
     position: absolute;
     width: 30%;
-    top: 15px;
+    top: 20px;
     right: 5px; }
   .projectEdit .formStep form {
     padding-top: 10px; }

diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss
@@ -2547,6 +2547,7 @@ body {
     .panel-heading {
         cursor: pointer;
         transition: background 0.1s linear;
+        padding: 0 15px 15px 15px;
         &:hover {
             background: rgba($progressSuccess, 0.1);
         }
@@ -2588,6 +2589,7 @@ body {
     .panel-heading {
         cursor: pointer;
         transition: background 0.1s linear;
+        padding: 0 15px 15px 15px;
         &:hover {
             background: rgba($rsrBlue2, 0.1);
         }
@@ -2656,7 +2658,7 @@ body {
         .section-progress {
             position: absolute;
             width: 30%;
-            top: 15px;
+            top: 20px;
             right: 5px;
         }
         form {