From dcef346c437ff453fe957dd6c6607fb267b2d5a1 Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Tue, 28 Apr 2015 09:20:37 -0400 Subject: [PATCH 1/6] Move scripts up --- package.json | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index ea0c6e323..a7656d895 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,23 @@ }, "main": "main.js", "description": "Brilliant continuous deployment platform", + "scripts": { + "test": "make test", + "start": "bin/strider", + "dev": "npm run build-debug && bin/strider", + "blanket": { + "pattern": "lib", + "data-cover-never": "node_modules" + }, + "pre": "mkdirp dist/scripts dist/styles", + "styles": "lessc client/styles/strider.less > dist/styles/styles.css", + "styles-debug": "lessc --source-map client/styles/strider.less dist/styles/styles.css", + "watch": "npm run pre && watchify -e client/app.js -o dist/scripts/app.js", + "build": "npm run pre && npm run styles && browserify -e client/app.js -o dist/scripts/app.js", + "build-debug": "npm run pre && npm run styles-debug && browserify -d -e client/app.js -o dist/scripts/app.js", + "unitcov": "istanbul cover _mocha --recursive test/unit", + "unitdev": "mocha -w --recursive test/unit -R min" + }, "keywords": [ "strider", "continuous integration", @@ -38,24 +55,6 @@ "browserify-shim" ] }, - "scripts": { - "test": "make test", - "start": "bin/strider", - "dev": "npm run build-debug && bin/strider", - "blanket": { - "pattern": "lib", - "data-cover-never": "node_modules" - }, - "pre": "mkdirp dist/scripts dist/styles", - "vendor": "bower-installer", - "styles": "lessc client/styles/strider.less > dist/styles/styles.css", - "styles-debug": "lessc --source-map client/styles/strider.less dist/styles/styles.css", - "watch": "npm run pre && watchify -e client/app.js -o dist/scripts/app.js", - "build": "npm run pre && npm run styles && browserify -e client/app.js -o dist/scripts/app.js", - "build-debug": "npm run pre && npm run styles-debug && browserify -d -e client/app.js -o dist/scripts/app.js", - "unitcov": "istanbul cover _mocha --recursive test/unit", - "unitdev": "mocha -w --recursive test/unit -R min" - }, "dependencies": { "MD5": "^1.2.1", "ansiparse": "0.0.5-1", From 2a27cff3a5aa91f6d5e05563b1977a16cfb149dc Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Tue, 28 Apr 2015 09:21:19 -0400 Subject: [PATCH 2/6] Set default auth type --- client/projects/controllers/manual.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/projects/controllers/manual.js b/client/projects/controllers/manual.js index 879be9b20..f47a822b9 100644 --- a/client/projects/controllers/manual.js +++ b/client/projects/controllers/manual.js @@ -4,7 +4,11 @@ var $ = require('jquery'); module.exports = function ($scope, $attrs) { var provider = $attrs.id.split('-')[1]; - $scope.config = {}; + $scope.config = { + auth: { + type: 'none' + } + }; $scope.projects = global.manualProjects[provider] || []; $scope.remove = function (project) { project.really_remove = 'removing'; From 3a1d61b618fb66d4e82cd068a2af6b0ceed5cedd Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Tue, 28 Apr 2015 09:21:30 -0400 Subject: [PATCH 3/6] Change manual layout/wording --- lib/views/projects.html | 67 +++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/lib/views/projects.html b/lib/views/projects.html index f0345f66d..7436346aa 100644 --- a/lib/views/projects.html +++ b/lib/views/projects.html @@ -151,6 +151,7 @@

Projects

+
{% for item in manual %}
@@ -158,20 +159,20 @@

Projects

{{ item.provider.title }}

- Public projects are visible to unauthenticated users. -

Public
+ Public projects are visible to unauthenticated users. +
Public

- Provides a link in the UI if you put a url there, so you can easily jump to viewing the repo on github or wherever -
- + + + Provides a link in the UI so you can easily jump to viewing the project's repository wherever it's hosted.

- A github-style namespace/name combination for the project. e.g. Strider-CD/strider -
- + + + A Github-style namespace/name combination for the project. e.g. Strider-CD/strider

@@ -186,16 +187,50 @@

{{ item.provider.title }}

+ [[ project.display_name ]] -
- - - - + +
+ + + + +
+
From 8e576a7ac1f638e54f81d7537eb1d8bed8cf52a1 Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Wed, 27 May 2015 07:53:19 -0400 Subject: [PATCH 4/6] Move git-manual tab to own partial views/partials/git-manual.html --- lib/views/partials/git-manual.html | 85 ++++++++++++++++++++++++++ lib/views/projects.html | 98 +++--------------------------- 2 files changed, 92 insertions(+), 91 deletions(-) create mode 100644 lib/views/partials/git-manual.html diff --git a/lib/views/partials/git-manual.html b/lib/views/partials/git-manual.html new file mode 100644 index 000000000..a3b09c27d --- /dev/null +++ b/lib/views/partials/git-manual.html @@ -0,0 +1,85 @@ +
+ {% for item in manual %} +
+
+

{{ item.provider.title }}

+
+

+ + + A Github-style namespace/name combination for the project. e.g. Strider-CD/strider +

+ +

+ + + Provides a link in the UI so you can easily jump to viewing the project's repository wherever it's hosted. +

+ +

+ Public projects are visible to unauthenticated users. +

Public
+

+
+ +
+ {{ item.provider.html | raw }} +
+ +
+ +
+ {% endfor %} +
diff --git a/lib/views/projects.html b/lib/views/projects.html index 7436346aa..556a447a4 100644 --- a/lib/views/projects.html +++ b/lib/views/projects.html @@ -13,7 +13,6 @@ {% endpluginblock %} - {% block bodyContent %}

Projects

@@ -48,12 +47,13 @@

Projects

{% endfor %}
-
-
- × -
-
+ +
+
+ × +
+
@@ -152,91 +152,7 @@

Projects

-
- {% for item in manual %} -
-
-

{{ item.provider.title }}

-
-

- Public projects are visible to unauthenticated users. -

Public
-

- -

- - - Provides a link in the UI so you can easily jump to viewing the project's repository wherever it's hosted. -

- -

- - - A Github-style namespace/name combination for the project. e.g. Strider-CD/strider -

-
- -
- {{ item.provider.html | raw }} -
- -
- -
- {% endfor %} -
+ {% include "partials/git-manual.html" %}
{% endblock %} From 60f07c36bb6c02e3da249fcc0ca10a82ef6b3f9e Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Wed, 27 May 2015 08:20:23 -0400 Subject: [PATCH 5/6] Make public into checkbox, reorder --- lib/views/partials/git-manual.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/views/partials/git-manual.html b/lib/views/partials/git-manual.html index a3b09c27d..3af9c8598 100644 --- a/lib/views/partials/git-manual.html +++ b/lib/views/partials/git-manual.html @@ -3,11 +3,14 @@

{{ item.provider.title }}

+

- - - A Github-style namespace/name combination for the project. e.g. Strider-CD/strider + + Public projects are visible to unauthenticated users.

@@ -17,8 +20,9 @@

{{ item.provider.title }}

- Public projects are visible to unauthenticated users. -

Public
+ + + A Github-style namespace/name combination for the project. e.g. Strider-CD/strider

From 8a545419ba5c192bc3f7d47295ddaa8b2feaa775 Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Wed, 27 May 2015 08:45:59 -0400 Subject: [PATCH 6/6] Make git-manual two column --- lib/views/partials/git-manual.html | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/views/partials/git-manual.html b/lib/views/partials/git-manual.html index 3af9c8598..85fa23dab 100644 --- a/lib/views/partials/git-manual.html +++ b/lib/views/partials/git-manual.html @@ -3,32 +3,33 @@

{{ item.provider.title }}

- -
-

- - Public projects are visible to unauthenticated users. -

- +
+

- +
Provides a link in the UI so you can easily jump to viewing the project's repository wherever it's hosted.

- +
A Github-style namespace/name combination for the project. e.g. Strider-CD/strider

+ +

+ + Public projects are visible to unauthenticated users. +

-
+
{{ item.provider.html | raw }}
+