Merge lp:~hatch/juju-gui/linkify-charm-descriptions into lp:juju-gui/experimental

[Jeff Pihach]

Linkify links in the charm/bundle details pages

Landing for Ant

https://codereview.appspot.com/19790044/

[Jeff Pihach (hatch)]

Reviewers: mp+193254_code.launchpad.net,

Message:
Please take a look.

Description:
Linkify links in the charm/bundle details pages

Landing for Ant

https://code.launchpad.net/~hatch/juju-gui/linkify-charm-descriptions/+merge/193254

(do not edit description out of merge proposal)

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

Affected files (+35, -6 lines):
   A [revision details]
   M app/subapps/browser/templates/browser_charm.handlebars
   M app/subapps/browser/views/charm.js
   M lib/views/browser/charm-full.less

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: lib/views/browser/charm-full.less
=== modified file 'lib/views/browser/charm-full.less'
--- lib/views/browser/charm-full.less 2013-10-25 21:31:55 +0000
+++ lib/views/browser/charm-full.less 2013-10-28 10:05:42 +0000
@@ -174,6 +174,7 @@
      #bws-summary,
      #bws-readme {
          padding-top: 10px;
+ padding-bottom: 50px;
      }
      #bws-readme {
          ul {

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-10-23
21:10:55 +0000
+++ app/subapps/browser/templates/browser_charm.handlebars 2013-10-28
10:05:42 +0000
@@ -89,7 +89,7 @@
                              <p><em>This is a local charm; only limited
information will be available</em></p>
                          {{/if}}
                          <h2>Description</h2>
- <p class="respect-whitespace">{{#if
isFullscreen}}{{ description }}{{else}}{{ truncate description 300
}}{{/if}}</p>
+ <p>{{#if isFullscreen}}{{{ description
}}}{{else}}{{{ truncate description 300 }}}{{/if}}</p>
                      </div>

                      <div class="changelog">
@@ -115,7 +115,7 @@
                                          {{prettyCommits.first.prettyDate}}
                                      </span>

<strong>{{prettyCommits.first.author.name}}</strong>
- <span
class="respect-whitespace">{{prettyCommits.first.message}}</span> -
+
<span>{{{prettyCommits.first.message}}}</span> -
                                      <a href="{{
prettyCommits.first.revnoLink }}">
                                        REVNO{{prettyCommits.first.revno}}
                                      </a>
@@ -134,7 +134,7 @@
                                                      {{prettyDate}}
                                                  </span>

<strong>{{author.name}}</strong>
- <span
class="respect-whitespace">{{message}}</span> -
+ <span>{{{message}}}</span>
-
             ...

[Jeff Pihach (hatch)]

LGTM QA OK!

https://codereview.appspot.com/19790044/

=== modified file 'app/subapps/browser/templates/browser_charm.handlebars'
--- app/subapps/browser/templates/browser_charm.handlebars	2013-10-30 13:11:05 +0000
+++ app/subapps/browser/templates/browser_charm.handlebars	2013-10-30 14:25:24 +0000
@@ -101,7 +101,7 @@
                             <p><em>This is a local charm; only limited information will be available</em></p>
                         {{/if}}
                         <h2>Description</h2>
-                        <p class="respect-whitespace">{{#if isFullscreen}}{{ description }}{{else}}{{ truncate description 300 }}{{/if}}</p>
+                        <p>{{#if isFullscreen}}{{{ description }}}{{else}}{{{ truncate description 300 }}}{{/if}}</p>
                     </div>
 
                     <div class="changelog">
@@ -127,7 +127,7 @@
                                         {{prettyCommits.first.prettyDate}}
                                     </span>
                                     <strong>{{prettyCommits.first.author.name}}</strong>
-                                    <span class="respect-whitespace">{{prettyCommits.first.message}}</span> -
+                                    <span>{{{prettyCommits.first.message}}}</span> -
                                     <a href="{{ prettyCommits.first.revnoLink }}">
                                       REVNO{{prettyCommits.first.revno}}
                                     </a>
@@ -146,7 +146,7 @@
                                                     {{prettyDate}}
                                                 </span>
                                                 <strong>{{author.name}}</strong>
-                                                <span class="respect-whitespace">{{message}}</span> -
+                                                <span>{{{message}}}</span> -
                                                 <a href="{{ revnoLink }}">
                                                     REVNO{{revno}}
                                                 </a>

=== modified file 'app/subapps/browser/views/charm.js'
--- app/subapps/browser/views/charm.js	2013-10-30 13:23:16 +0000
+++ app/subapps/browser/views/charm.js	2013-10-30 14:25:24 +0000
@@ -334,6 +334,7 @@
       templateData.emailText = escape(
           'Check out this great charm on ' + siteDomain + ': ' + link);
 
+<<<<<<< TREE
       if (Y.Object.isEmpty(templateData.requires)) {
         templateData.requires = false;
       }
@@ -344,6 +345,21 @@
       var template = this.template(templateData);
 
       // Set the content then update the container so that it reloads
+=======
+      if (Y.Object.isEmpty(tplData.requires)) {
+        tplData.requires = false;
+      }
+      if (Y.Object.isEmpty(tplData.provides)) {
+        tplData.provides = false;
+      }
+      // Wrap plain text links in descriptions and commit messages with a tags
+      tplData.description = this.Linkify(tplData.description);
+      tplData.recent_commits.forEach(function(commit) {
+        commit.message = this.Linkify(commit.message);
+      }, this);
+      var tpl = this.template(tplData);
+      // Set the content then update the container so that it reload
+>>>>>>> MERGE-SOURCE
       // events.
       var renderTo = this.get('renderTo');
       renderTo.setHTML(container.setHTML(template));
@@ -375,6 +391,30 @@
     },
 
     /**
+       Sanitize links.
+
+       Linkify links in the plain text descriptions and commit messages.
+       Wrap launchpad branch locations in spans to wrap them.
+
+       @method Linkify
+     */
+    Linkify: function(text) {
+      if (text) {
+        // Wraps an a tag around links.
+        var links =
+            /(\b(https?|http):\/\/[-A-Za-z0-9+&@#\/%?=~_()|!:,.;]*[-A-Za-z0-9+&@#\/%=~_()|]+)/ig;
+        text = text.replace(links,
+            '<a href="$1" target="_blank" class="respect-whitespace">$1</a>');
+
+        // Puts lp branch addresses in spans with respect-whitespace
+        var lp_links = /(\b(lp:~)[^ ]*[0-9A-Za-z_]+)/ig;
+        text = text.replace(lp_links,
+            '<span class="respect-whitespace">$1</span>');
+      }
+      return text;
+    },
+
+    /**
        Render out the view to the DOM.
 
        The View might be given either a entityId, which means go fetch the
@@ -387,7 +427,6 @@
     render: function() {
       var isFullscreen = this.get('isFullscreen');
       this.showIndicator(this.get('renderTo'));
-
       if (this.get('entity')) {
         this._renderCharmView(this.get('entity'), isFullscreen);
         this.hideIndicator(this.get('renderTo'));

=== modified file 'lib/views/browser/charm-full.less'
--- lib/views/browser/charm-full.less	2013-10-30 12:54:32 +0000
+++ lib/views/browser/charm-full.less	2013-10-30 14:25:24 +0000
@@ -180,6 +180,7 @@
     #bws-summary,
     #bws-readme {
         padding-top: 10px;
+        padding-bottom: 50px;
     }
     #bws-readme {
         ul {