From a05bbc4d7ef148719be97481185ccf23c8292b94 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 17 Jun 2016 18:07:20 +0200
Subject: [PATCH] SONAR-7229 apply feedback

---
 .../src/main/js/apps/account/account.css      |  4 +-
 .../js/apps/account/projects/ProjectCard.js   | 40 +++++++++----------
 .../main/js/apps/account/projects/Projects.js | 15 +++++--
 .../apps/account/projects/ProjectsSearch.js   | 10 ++---
 .../resources/org/sonar/l10n/core.properties  |  1 +
 5 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/account/account.css b/server/sonar-web/src/main/js/apps/account/account.css
index d8ff05b231c..b2a1839311c 100644
--- a/server/sonar-web/src/main/js/apps/account/account.css
+++ b/server/sonar-web/src/main/js/apps/account/account.css
@@ -45,7 +45,7 @@
 }
 
 .account-projects {
-  max-width: 600px;
+  max-width: 960px;
 }
 
 .account-projects-list > li + li {
@@ -105,7 +105,7 @@
 }
 
 .account-project-links {
-  margin-top: 4px;
+  margin-top: 6px;
 }
 
 .account-project-key {
diff --git a/server/sonar-web/src/main/js/apps/account/projects/ProjectCard.js b/server/sonar-web/src/main/js/apps/account/projects/ProjectCard.js
index b5cffd8ec44..f7d7556da81 100644
--- a/server/sonar-web/src/main/js/apps/account/projects/ProjectCard.js
+++ b/server/sonar-web/src/main/js/apps/account/projects/ProjectCard.js
@@ -37,7 +37,7 @@ export default class ProjectCard extends React.Component {
     const links = sortBy(project.links, 'type');
 
     return (
-        <div className="account-project-card" href="#">
+        <div className="account-project-card clearfix">
           <aside className="account-project-side">
             {isAnalyzed ? (
                 <div className="account-project-analysis"
@@ -53,22 +53,9 @@ export default class ProjectCard extends React.Component {
                 </div>
             )}
 
-            {links.length > 0 && (
-                <div className="account-project-links">
-                  <ul className="list-inline">
-                    {links.map(link => (
-                        <li key={link.type}>
-                          <a
-                              className="link-with-icon"
-                              href={link.href}
-                              title={link.name}
-                              target="_blank"
-                              rel="nofollow">
-                            <i className={`icon-color-link icon-${link.type}`}/>
-                          </a>
-                        </li>
-                    ))}
-                  </ul>
+            {project.qualityGate != null && (
+                <div className="account-project-quality-gate">
+                  <Level level={project.qualityGate}/>
                 </div>
             )}
           </aside>
@@ -79,9 +66,22 @@ export default class ProjectCard extends React.Component {
             </a>
           </h3>
 
-          {project.qualityGate != null && (
-              <div className="account-project-quality-gate">
-                <Level level={project.qualityGate}/>
+          {links.length > 0 && (
+              <div className="account-project-links">
+                <ul className="list-inline">
+                  {links.map(link => (
+                      <li key={link.type}>
+                        <a
+                            className="link-with-icon"
+                            href={link.href}
+                            title={link.name}
+                            target="_blank"
+                            rel="nofollow">
+                          <i className={`icon-color-link icon-${link.type}`}/>
+                        </a>
+                      </li>
+                  ))}
+                </ul>
               </div>
           )}
 
diff --git a/server/sonar-web/src/main/js/apps/account/projects/Projects.js b/server/sonar-web/src/main/js/apps/account/projects/Projects.js
index d5d89fc8776..b77242df8cc 100644
--- a/server/sonar-web/src/main/js/apps/account/projects/Projects.js
+++ b/server/sonar-web/src/main/js/apps/account/projects/Projects.js
@@ -38,13 +38,22 @@ export default class Projects extends React.Component {
 
     return (
         <div className="page page-limited account-projects">
-          <ProjectsSearch
-              onSearch={this.props.search}/>
+          <header className="page-header">
+            <h1 className="page-title">
+              My Projects
+            </h1>
+            <div className="pull-right">
+              <ProjectsSearch onSearch={this.props.search}/>
+            </div>
+            <div className="page-description">
+              {translate('my_account.projects.description')}
+            </div>
+          </header>
 
           {projects.length === 0 && (
               <div className="js-no-results">
                 {translate('no_results')}
-                </div>
+              </div>
           )}
 
           {projects.length > 0 && (
diff --git a/server/sonar-web/src/main/js/apps/account/projects/ProjectsSearch.js b/server/sonar-web/src/main/js/apps/account/projects/ProjectsSearch.js
index ad8dacd9414..b0250ecafe7 100644
--- a/server/sonar-web/src/main/js/apps/account/projects/ProjectsSearch.js
+++ b/server/sonar-web/src/main/js/apps/account/projects/ProjectsSearch.js
@@ -46,7 +46,7 @@ export default class ProjectsSearch extends React.Component {
 
   render () {
     return (
-        <div className="big-spacer-bottom">
+        <div>
           <form onSubmit={this.handleSubmit}>
             <input
                 ref="input"
@@ -54,10 +54,10 @@ export default class ProjectsSearch extends React.Component {
                 className="input-large"
                 placeholder={translate('search_verb')}
                 onChange={this.handleChange}/>
-              <span className="note spacer-left">
-                {translateWithParameters(
-                    'my_account.projects.x_characters_min', 3)}
-              </span>
+            <div className="note little-spacer-top text-right">
+              {translateWithParameters(
+                  'my_account.projects.x_characters_min', 3)}
+            </div>
           </form>
         </div>
     );
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index f1fdd1b9ac9..d1b10427309 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2122,6 +2122,7 @@ my_account.issue_widget.by_severity=My Issues by Severity
 my_account.to_fix=To Fix
 my_account.to_review=To Review
 my_account.projects=Projects
+my_account.projects.description=On those projects you have the "Administer" permission.
 my_account.projects.analyzed_x=Analyzed {0}
 my_account.projects.never_analyzed=Never analyzed
 my_account.projects.x_characters_min=({0} characters min)
-- 
2.39.5