Merge into trunk : visualtweaks : Code : juju-gui

Status:	Merged
Merged at revision:	853
Proposed branch:	lp://staging/~gary/juju-gui/visualtweaks
Merge into:	lp://staging/juju-gui/experimental
Diff against target:	185 lines (+33/-28) 9 files modified app/subapps/browser/templates/browser_charm.handlebars (+13/-10) app/subapps/browser/templates/editorial.handlebars (+4/-5) app/subapps/browser/views/charm.js (+2/-2) app/templates/overview.handlebars (+3/-3) app/templates/providers.partial (+4/-2) lib/views/browser/charm-full.less (+1/-1) lib/views/browser/tabview.less (+1/-1) lib/views/stylesheet.less (+1/-0) test/test_browser_charm_details.js (+4/-4)
To merge this branch:	bzr merge lp://staging/~gary/juju-gui/visualtweaks
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju GUI Hackers		2013-07-17	Pending
Review via email: mp+175371@code.staging.launchpad.net

Description of the change

Visual updates

visual changes to change "hooks" to "source", add provider test links, add a contribute link, and update copy per copywriter requests

https://codereview.appspot.com/11462043/

Revision history for this message

Gary Poster (gary) wrote on 2013-07-17:

#

Download full text (10.0 KiB)

Reviewers: mp+175371_code.launchpad.net,

Message:
Please take a look.

Description:
Visual updates

visual changes to change "hooks" to "source", add provider test links,
add a contribute link, and update copy per copywriter requests

https://code.launchpad.net/~gary/juju-gui/visualtweaks/+merge/175371

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/11462043/

Affected files:
   A [revision details]
   M app/subapps/browser/templates/browser_charm.handlebars
   M app/subapps/browser/templates/editorial.handlebars
   M app/subapps/browser/views/charm.js
   M app/templates/overview.handlebars
   M app/templates/providers.partial
   M lib/views/browser/charm-full.less
   M lib/views/browser/tabview.less
   M lib/views/stylesheet.less
   M test/test_browser_charm_details.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: app/templates/overview.handlebars
=== modified file 'app/templates/overview.handlebars'
--- app/templates/overview.handlebars 2013-07-11 21:17:04 +0000
+++ app/templates/overview.handlebars 2013-07-17 18:27:38 +0000
@@ -3,11 +3,11 @@
          <div id="environment-help" style="display: none;">
              <div class="vertical-center-floater"></div>
              <div class="content">
- <h1>Add your first charm here!</h1>
+ <h1>Start adding charms!</h1>
                  <i class="sprite empty_canvas"></i>
                  <p>
- Click on a charm on the left to view its details. Select
the
- Add button to add it to this canvas.
+ Explore the charms to find the one you need. Drag it onto
the
+ canvas to start building.
                  </p>
              </div>
          </div>

Index: app/subapps/browser/templates/browser_charm.handlebars
=== modified file 'app/subapps/browser/templates/browser_charm.handlebars'
--- app/subapps/browser/templates/browser_charm.handlebars 2013-07-16
21:29:53 +0000
+++ app/subapps/browser/templates/browser_charm.handlebars 2013-07-17
18:27:38 +0000
@@ -47,7 +47,7 @@
                  <li><a href="#bws-readme"
class="bws-readme">Readme</a></li>
                  <li><a href="#bws-interfaces"
class="bws-interfaces">Interfaces</a></li>
                  <li><a href="#bws-configuration"
class="bws-configuration">Configuration</a></li>
- <li><a href="#bws-hooks" class="bws-hooks">Hooks</a></li>
+ <li><a href="#bws-source"
class="bws-source">Source</a></li>
                  <li><a href="#bws-qa" class="bws-qa">Quality</a></li>
              </ul>
              <hr />
@@ -249,15 +249,18 @@
                        <p>This charm does not expose any configuration
options.</p>
                      {{/if}}
                  </div>
- <d...

Reviewers: mp+175371_code.launchpad.net,

Message:
Please take a look.

Description:
Visual updates

visual changes to change "hooks" to "source", add provider test links,
add a contribute link, and update copy per copywriter requests

https://code.launchpad.net/~gary/juju-gui/visualtweaks/+merge/175371

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/11462043/

Affected files:
   A [revision details]
   M app/subapps/browser/templates/browser_charm.handlebars
   M app/subapps/browser/templates/editorial.handlebars
   M app/subapps/browser/views/charm.js
   M app/templates/overview.handlebars
   M app/templates/providers.partial
   M lib/views/browser/charm-full.less
   M lib/views/browser/tabview.less
   M lib/views/stylesheet.less
   M test/test_browser_charm_details.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: matthew.scott@canonical.com-20130717135307-mshb0u5zqkdv2tcj
+New revision: gary.poster@canonical.com-20130717183207-2csslgezfvob2f34

Index: app/templates/overview.handlebars
=== modified file 'app/templates/overview.handlebars'
--- app/templates/overview.handlebars	2013-07-11 21:17:04 +0000
+++ app/templates/overview.handlebars	2013-07-17 18:27:38 +0000
@@ -3,11 +3,11 @@
          <div id="environment-help" style="display: none;">
              <div class="vertical-center-floater"></div>
              <div class="content">
-                <h1>Add your first charm here!</h1>
+                <h1>Start adding charms!</h1>
                  <i class="sprite empty_canvas"></i>
                  <p>
-                Click on a charm on the left to view its details. Select  
the
-                Add button to add it to this canvas.
+                Explore the charms to find the one you need. Drag it onto  
the
+                canvas to start building.
                  </p>
              </div>
          </div>

Index: app/subapps/browser/templates/browser_charm.handlebars
=== modified file 'app/subapps/browser/templates/browser_charm.handlebars'
--- app/subapps/browser/templates/browser_charm.handlebars	2013-07-16  
21:29:53 +0000
+++ app/subapps/browser/templates/browser_charm.handlebars	2013-07-17  
18:27:38 +0000
@@ -47,7 +47,7 @@
                  <li><a href="#bws-readme"  
class="bws-readme">Readme</a></li>
                  <li><a href="#bws-interfaces"  
class="bws-interfaces">Interfaces</a></li>
                  <li><a href="#bws-configuration"  
class="bws-configuration">Configuration</a></li>
-                <li><a href="#bws-hooks" class="bws-hooks">Hooks</a></li>
+                <li><a href="#bws-source"  
class="bws-source">Source</a></li>
                  <li><a href="#bws-qa" class="bws-qa">Quality</a></li>
              </ul>
              <hr />
@@ -249,15 +249,18 @@
                        <p>This charm does not expose any configuration  
options.</p>
                      {{/if}}
                  </div>
-                <div id="bws-hooks">
-                    <p class="intro">
-                        Hooks are the pieces of code that comprise the  
charm.
-                        A particular hook responds to specific events that  
Juju
-                        gives the charm, e.g. when there’s a change in the
-                        environment or an administrator has made a change  
to
-                        its configuration. Hooks are of interest mainly to
-                        charm authors and advanced users. Select a hook  
below
-                        to view its code.
+                <div id="bws-source">
+                    <p class="intro">
+                        The source code of the charm includes scripts,  
metadata,
+                        and other supporting files to describe and install  
a
+                        service.
+                    </p>
+                    <p class="intro">
+                        <a  
href="https://juju.ubuntu.com/docs/authors-charm-store.html"
+                        target="help">Please contribute to this charm!</a>
+                    </p>
+                    <p class="intro">
+                        Select a file below to view the contents.
                      </p>
                      <select>
                          <option>Select --</option>

Index: app/subapps/browser/templates/editorial.handlebars
=== modified file 'app/subapps/browser/templates/editorial.handlebars'
--- app/subapps/browser/templates/editorial.handlebars	2013-07-11 06:11:21  
+0000
+++ app/subapps/browser/templates/editorial.handlebars	2013-07-17 18:27:38  
+0000
@@ -5,11 +5,10 @@
                  <div class="copy yui3-u-1-2">
                      <h1>Experience Juju</h1>
                      <p>
-                        You can immediately start deploying services and
-                        building relations between them without having to
-                        install Juju or have an account with a Cloud  
provider.
-                        Simply find the Charm you want and then  
click "Add" to
-                        start experiencing the ease of using Juju.
+                        With Juju you can begin deploying services and  
building
+                        relations immediately. Just find a charm and add  
it to
+                        your canvas to get your environment started. It's  
that
+                        simple.
                      </p>
                  </div>
                  <div class="yui3-u-1-2">

Index: app/subapps/browser/views/charm.js
=== modified file 'app/subapps/browser/views/charm.js'
--- app/subapps/browser/views/charm.js	2013-07-16 21:48:55 +0000
+++ app/subapps/browser/views/charm.js	2013-07-17 18:27:38 +0000
@@ -54,7 +54,7 @@
        '.charm .add': {
          click: '_addCharmEnvironment'
        },
-      '#bws-hooks select': {
+      '#bws-source select': {
          change: '_loadHookContent'
        },
        '.charm .back': {
@@ -353,7 +353,7 @@
        var index = ev.currentTarget.get('selectedIndex');
        var filename = ev.currentTarget.get('options').item(
            index).getAttribute('value'),
-          node = this.get('container').one('#bws-hooks .filecontent');
+          node = this.get('container').one('#bws-source .filecontent');

// Load the file, but make sure we prettify the code.
        if (filename) {

Index: app/templates/providers.partial
=== modified file 'app/templates/providers.partial'
--- app/templates/providers.partial	2013-07-11 03:46:48 +0000
+++ app/templates/providers.partial	2013-07-17 18:27:38 +0000
@@ -6,7 +6,8 @@
                  {{#providers.successes}}
                      <li>
                          <i class="sprite provider_success"></i>
-                        <span>{{.}}</span>
+                        <a  
href="https://jenkins.qa.ubuntu.com/job/{{../../series}}-{{.}}-charm-{{../../name}}/lastBuild"
+                        target="help">{{.}}</a>
                      </li>
                  {{/providers.successes}}
              </ul>
@@ -16,7 +17,8 @@
                  {{#providers.failures}}
                      <li>
                          <i class="sprite provider_failure"></i>
-                        <span>{{.}}</span>
+                        <a  
href="https://jenkins.qa.ubuntu.com/job/{{../../series}}-{{.}}-charm-{{../../name}}/lastBuild"
+                        target="help">{{.}}</a>
                      </li>
                  {{/providers.failures}}
              </ul>

Index: lib/views/stylesheet.less
=== modified file 'lib/views/stylesheet.less'
--- lib/views/stylesheet.less	2013-07-16 06:11:15 +0000
+++ lib/views/stylesheet.less	2013-07-17 18:27:38 +0000
@@ -328,6 +328,7 @@
                      #notify-indicator {
                          .button;
                          margin: 0 9px 0 0;
+                        padding: 6px 12px;
                      }
                      #notify-list {
                          white-space: normal;

Index: lib/views/browser/charm-full.less
=== modified file 'lib/views/browser/charm-full.less'
--- lib/views/browser/charm-full.less	2013-07-17 01:40:40 +0000
+++ lib/views/browser/charm-full.less	2013-07-17 18:27:38 +0000
@@ -60,7 +60,7 @@
          display: table-cell;
      }
      .header li a,
-    .providers li span {
+    .providers li a {
          color: @bws-text;
          text-decoration: underline;
      }

Index: lib/views/browser/tabview.less
=== modified file 'lib/views/browser/tabview.less'
--- lib/views/browser/tabview.less	2013-07-10 21:20:12 +0000
+++ lib/views/browser/tabview.less	2013-07-17 18:27:38 +0000
@@ -9,7 +9,7 @@
      }
      .yui3-tabview-list {
          li {
-            margin-right: 40px;
+            margin-right: 38px;

&:last-child {
                  margin-right: 0;

Index: test/test_browser_charm_details.js
=== modified file 'test/test_browser_charm_details.js'
--- test/test_browser_charm_details.js	2013-07-16 21:48:55 +0000
+++ test/test_browser_charm_details.js	2013-07-17 18:32:07 +0000
@@ -307,14 +307,14 @@
        });

view.render();
-      Y.one('#bws-hooks').all('select option').size().should.equal(3);
+      Y.one('#bws-source').all('select option').size().should.equal(3);

// Select the hooks install and the content should update.
-      Y.one('#bws-hooks').all('select option').item(2).set(
+      Y.one('#bws-source').all('select option').item(2).set(
            'selected', 'selected');
-      Y.one('#bws-hooks').one('select').simulate('change');
+      Y.one('#bws-source').one('select').simulate('change');

-      var content = Y.one('#bws-hooks').one('div.filecontent');
+      var content = Y.one('#bws-source').one('div.filecontent');
        content.get('text').should.eql('install hook content.');
      });

Revision history for this message

Richard Harding (rharding) wrote on 2013-07-17:

#

LGTM thanks

https://codereview.appspot.com/11462043/

Revision history for this message

Gary Poster (gary) wrote on 2013-07-17:

#

*** Submitted:

Visual updates

visual changes to change "hooks" to "source", add provider test links,
add a contribute link, and update copy per copywriter requests

R=rharding, benji
CC=
https://codereview.appspot.com/11462043

https://codereview.appspot.com/11462043/

juju-gui

Merge lp://staging/~gary/juju-gui/visualtweaks into lp://staging/juju-gui/experimental

Commit message

Description of the change

Preview Diff

Subscribers