Merge pull request openshift#8733 from jhadvig/BZ1332876

Merged by openshift-bot
FyreNet · May 5, 2016 · d7e1ba0 · d7e1ba0
2 parents 21d5847 + 53fb3fd
commit d7e1ba0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/assets/app/views/browse/_build-details.html b/assets/app/views/browse/_build-details.html
@@ -44,7 +44,7 @@ <h3>Configuration <span class="small" ng-if="buildConfigName">created from <a hr
         <dt>Source type:</dt>
         <dd>{{build.spec.source.type}}</dd>
         <dt ng-if-start="build.spec.source.git.uri">Source repo:</dt>
-        <dd ng-if-end><span ng-bind-html='build.spec.source.git.uri | githubLink : build.spec.source.git.ref : build.spec.source.contextDir | linky'></span></dd>
+        <dd ng-if-end><span class="word-break" ng-bind-html='build.spec.source.git.uri | githubLink : build.spec.source.git.ref : build.spec.source.contextDir | linky'></span></dd>
         <dt ng-if-start="build.spec.source.git.ref">Source ref:</dt>
         <dd ng-if-end>{{build.spec.source.git.ref}}</dd>
         <dt ng-if-start="build.spec.source.contextDir">Source context dir:</dt>

diff --git a/assets/app/views/browse/build-config.html b/assets/app/views/browse/build-config.html
@@ -85,7 +85,7 @@ <h2>No builds.</h2>
                         Start a new build to create an image from
                         <span ng-if="buildConfig.spec.source.type === 'Git'">
                           source repository
-                          <span ng-bind-html='buildConfig.spec.source.git.uri | githubLink : buildConfig.spec.source.git.ref : buildConfig.spec.source.contextDir | linky'></span>
+                          <span class="word-break" ng-bind-html='buildConfig.spec.source.git.uri | githubLink : buildConfig.spec.source.git.ref : buildConfig.spec.source.contextDir | linky'></span>
                         </span>
                         <span ng-if="buildConfig.spec.source.type !== 'Git'">
                           build configuration {{buildConfig.metadata.name}}.
@@ -240,7 +240,7 @@ <h3>Configuration</h3>
                               <div ng-if="buildConfig.spec.source">
                                 <div ng-if="buildConfig.spec.source.type == 'Git'">
                                   <dt>Source repo:</dt>
-                                  <dd ng-bind-html='buildConfig.spec.source.git.uri | githubLink : buildConfig.spec.source.git.ref : buildConfig.spec.source.contextDir | linky'></dd>
+                                  <dd class="word-break" ng-bind-html='buildConfig.spec.source.git.uri | githubLink : buildConfig.spec.source.git.ref : buildConfig.spec.source.contextDir | linky'></dd>
                                   <dt ng-if="buildConfig.spec.source.git.ref">Source ref:</dt>
                                   <dd ng-if="buildConfig.spec.source.git.ref">{{buildConfig.spec.source.git.ref}}</dd>
                                   <dt ng-if="buildConfig.spec.source.contextDir">Source context dir:</dt>

diff --git a/assets/app/views/builds.html b/assets/app/views/builds.html
@@ -47,7 +47,7 @@ <h1>Builds</h1>
                     <td data-title="Type">{{buildConfigs[buildConfigName].spec.strategy.type | startCase}}</td>
                     <td data-title="Source">
                       <span ng-if="buildConfigs[buildConfigName].spec.source.type == 'None'"><i>none</i></span>
-                      <span ng-if="buildConfigs[buildConfigName].spec.source.type == 'Git'" ng-bind-html='buildConfigs[buildConfigName].spec.source.git.uri | githubLink : buildConfigs[buildConfigName].spec.source.git.ref : buildConfigs[buildConfigName].spec.source.contextDir | linky'></span></td>
+                      <span class="word-break" ng-if="buildConfigs[buildConfigName].spec.source.type == 'Git'" ng-bind-html='buildConfigs[buildConfigName].spec.source.git.uri | githubLink : buildConfigs[buildConfigName].spec.source.git.ref : buildConfigs[buildConfigName].spec.source.contextDir | linky'></span></td>
                   </tr>
                   <!-- Build config with builds, or builds whose build config has since been deleted -->
                   <!-- We only show the first build from a build config for now-->
@@ -100,7 +100,7 @@ <h1>Builds</h1>
                         <span ng-if="build.spec.source.type == 'None'">
                           <i>none</i>
                         </span>
-                        <span ng-if="build.spec.source.type == 'Git'" ng-bind-html='build.spec.source.git.uri | githubLink : build.spec.source.git.ref : build.spec.source.contextDir | linky'></span>
+                        <span class="word-break" ng-if="build.spec.source.type == 'Git'" ng-bind-html='build.spec.source.git.uri | githubLink : build.spec.source.git.ref : build.spec.source.contextDir | linky'></span>
                       </span>
                     </td>
                   </tr>

diff --git a/assets/app/views/create/next-steps.html b/assets/app/views/create/next-steps.html
@@ -71,7 +71,7 @@ <h3>Command line tools</h3>
               <div ng-if="createdBuildConfig" class="col-md-6">
                 <h2>Making code changes</h2>
                 <p ng-if="fromSampleRepo">
-                  You are set up to use the example git repository. If you would like to modify the source code, fork the <a target="_blank" href="{{createdBuildConfig.spec.source.git.uri | githubLink}}">{{createdBuildConfig.spec.source.git.uri | githubLink}}</a> repository to an OpenShift-visible git account and <a href="{{createdBuildConfig | editResourceURL}}">edit the <strong>{{createdBuildConfig.metadata.name}}</strong> build config</a> to point to your fork.
+                  You are set up to use the example git repository. If you would like to modify the source code, fork the <a class="word-break" target="_blank" href="{{createdBuildConfig.spec.source.git.uri | githubLink}}">{{createdBuildConfig.spec.source.git.uri | githubLink}}</a> repository to an OpenShift-visible git account and <a href="{{createdBuildConfig | editResourceURL}}">edit the <strong>{{createdBuildConfig.metadata.name}}</strong> build config</a> to point to your fork.
                   <span ng-if="createdBuildConfigWithConfigChangeTrigger()">Note that this will start a new build.</span>
                 </p>
                 <div ng-repeat="trigger in createdBuildConfig.spec.triggers" ng-if="trigger.type == 'GitHub'">
@@ -82,7 +82,7 @@ <h2>Making code changes</h2>
                   	You can configure the webhook in the forked repository's settings, using the following payload URL:
                   </p>
                   <p ng-if="!fromSampleRepo">
-                    You can now set up the webhook in the GitHub repository settings if you own it, in <a target="_blank" href="{{createdBuildConfig.spec.source.git.uri | githubLink}}/settings/hooks">{{createdBuildConfig.spec.source.git.uri | githubLink}}/settings/hooks</a>, using the following payload URL:
+                    You can now set up the webhook in the GitHub repository settings if you own it, in <a target="_blank" class="word-break" href="{{createdBuildConfig.spec.source.git.uri | githubLink}}/settings/hooks">{{createdBuildConfig.spec.source.git.uri | githubLink}}/settings/hooks</a>, using the following payload URL:
                   </p>
 									<pre class="code">{{createdBuildConfig.metadata.name | webhookURL : trigger.type : trigger.github.secret : projectName}}</pre>
                 </div>

diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
@@ -10682,7 +10682,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<dt>Source type:</dt>\n" +
     "<dd>{{build.spec.source.type}}</dd>\n" +
     "<dt ng-if-start=\"build.spec.source.git.uri\">Source repo:</dt>\n" +
-    "<dd ng-if-end><span ng-bind-html=\"build.spec.source.git.uri | githubLink : build.spec.source.git.ref : build.spec.source.contextDir | linky\"></span></dd>\n" +
+    "<dd ng-if-end><span class=\"word-break\" ng-bind-html=\"build.spec.source.git.uri | githubLink : build.spec.source.git.ref : build.spec.source.contextDir | linky\"></span></dd>\n" +
     "<dt ng-if-start=\"build.spec.source.git.ref\">Source ref:</dt>\n" +
     "<dd ng-if-end>{{build.spec.source.git.ref}}</dd>\n" +
     "<dt ng-if-start=\"build.spec.source.contextDir\">Source context dir:</dt>\n" +
@@ -10991,7 +10991,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "Start a new build to create an image from\n" +
     "<span ng-if=\"buildConfig.spec.source.type === 'Git'\">\n" +
     "source repository\n" +
-    "<span ng-bind-html=\"buildConfig.spec.source.git.uri | githubLink : buildConfig.spec.source.git.ref : buildConfig.spec.source.contextDir | linky\"></span>\n" +
+    "<span class=\"word-break\" ng-bind-html=\"buildConfig.spec.source.git.uri | githubLink : buildConfig.spec.source.git.ref : buildConfig.spec.source.contextDir | linky\"></span>\n" +
     "</span>\n" +
     "<span ng-if=\"buildConfig.spec.source.type !== 'Git'\">\n" +
     "build configuration {{buildConfig.metadata.name}}.\n" +
@@ -11140,7 +11140,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<div ng-if=\"buildConfig.spec.source\">\n" +
     "<div ng-if=\"buildConfig.spec.source.type == 'Git'\">\n" +
     "<dt>Source repo:</dt>\n" +
-    "<dd ng-bind-html=\"buildConfig.spec.source.git.uri | githubLink : buildConfig.spec.source.git.ref : buildConfig.spec.source.contextDir | linky\"></dd>\n" +
+    "<dd class=\"word-break\" ng-bind-html=\"buildConfig.spec.source.git.uri | githubLink : buildConfig.spec.source.git.ref : buildConfig.spec.source.contextDir | linky\"></dd>\n" +
     "<dt ng-if=\"buildConfig.spec.source.git.ref\">Source ref:</dt>\n" +
     "<dd ng-if=\"buildConfig.spec.source.git.ref\">{{buildConfig.spec.source.git.ref}}</dd>\n" +
     "<dt ng-if=\"buildConfig.spec.source.contextDir\">Source context dir:</dt>\n" +
@@ -12553,7 +12553,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<td data-title=\"Type\">{{buildConfigs[buildConfigName].spec.strategy.type | startCase}}</td>\n" +
     "<td data-title=\"Source\">\n" +
     "<span ng-if=\"buildConfigs[buildConfigName].spec.source.type == 'None'\"><i>none</i></span>\n" +
-    "<span ng-if=\"buildConfigs[buildConfigName].spec.source.type == 'Git'\" ng-bind-html=\"buildConfigs[buildConfigName].spec.source.git.uri | githubLink : buildConfigs[buildConfigName].spec.source.git.ref : buildConfigs[buildConfigName].spec.source.contextDir | linky\"></span></td>\n" +
+    "<span class=\"word-break\" ng-if=\"buildConfigs[buildConfigName].spec.source.type == 'Git'\" ng-bind-html=\"buildConfigs[buildConfigName].spec.source.git.uri | githubLink : buildConfigs[buildConfigName].spec.source.git.ref : buildConfigs[buildConfigName].spec.source.contextDir | linky\"></span></td>\n" +
     "</tr>\n" +
     "\n" +
     "\n" +
@@ -12606,7 +12606,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<span ng-if=\"build.spec.source.type == 'None'\">\n" +
     "<i>none</i>\n" +
     "</span>\n" +
-    "<span ng-if=\"build.spec.source.type == 'Git'\" ng-bind-html=\"build.spec.source.git.uri | githubLink : build.spec.source.git.ref : build.spec.source.contextDir | linky\"></span>\n" +
+    "<span class=\"word-break\" ng-if=\"build.spec.source.type == 'Git'\" ng-bind-html=\"build.spec.source.git.uri | githubLink : build.spec.source.git.ref : build.spec.source.contextDir | linky\"></span>\n" +
     "</span>\n" +
     "</td>\n" +
     "</tr>\n" +
@@ -13269,7 +13269,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "<div ng-if=\"createdBuildConfig\" class=\"col-md-6\">\n" +
     "<h2>Making code changes</h2>\n" +
     "<p ng-if=\"fromSampleRepo\">\n" +
-    "You are set up to use the example git repository. If you would like to modify the source code, fork the <a target=\"_blank\" href=\"{{createdBuildConfig.spec.source.git.uri | githubLink}}\">{{createdBuildConfig.spec.source.git.uri | githubLink}}</a> repository to an OpenShift-visible git account and <a href=\"{{createdBuildConfig | editResourceURL}}\">edit the <strong>{{createdBuildConfig.metadata.name}}</strong> build config</a> to point to your fork.\n" +
+    "You are set up to use the example git repository. If you would like to modify the source code, fork the <a class=\"word-break\" target=\"_blank\" href=\"{{createdBuildConfig.spec.source.git.uri | githubLink}}\">{{createdBuildConfig.spec.source.git.uri | githubLink}}</a> repository to an OpenShift-visible git account and <a href=\"{{createdBuildConfig | editResourceURL}}\">edit the <strong>{{createdBuildConfig.metadata.name}}</strong> build config</a> to point to your fork.\n" +
     "<span ng-if=\"createdBuildConfigWithConfigChangeTrigger()\">Note that this will start a new build.</span>\n" +
     "</p>\n" +
     "<div ng-repeat=\"trigger in createdBuildConfig.spec.triggers\" ng-if=\"trigger.type == 'GitHub'\">\n" +
@@ -13280,7 +13280,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "You can configure the webhook in the forked repository's settings, using the following payload URL:\n" +
     "</p>\n" +
     "<p ng-if=\"!fromSampleRepo\">\n" +
-    "You can now set up the webhook in the GitHub repository settings if you own it, in <a target=\"_blank\" href=\"{{createdBuildConfig.spec.source.git.uri | githubLink}}/settings/hooks\">{{createdBuildConfig.spec.source.git.uri | githubLink}}/settings/hooks</a>, using the following payload URL:\n" +
+    "You can now set up the webhook in the GitHub repository settings if you own it, in <a target=\"_blank\" class=\"word-break\" href=\"{{createdBuildConfig.spec.source.git.uri | githubLink}}/settings/hooks\">{{createdBuildConfig.spec.source.git.uri | githubLink}}/settings/hooks</a>, using the following payload URL:\n" +
     "</p>\n" +
     "<pre class=\"code\">{{createdBuildConfig.metadata.name | webhookURL : trigger.type : trigger.github.secret : projectName}}</pre>\n" +
     "</div>\n" +