From 134fddc4aaa2e4bd4524ae5aa2d9737b4368b344 Mon Sep 17 00:00:00 2001
From: benweet <benoit.schweblin@gmail.com>
Date: Tue, 22 Jul 2014 12:42:21 +0100
Subject: [PATCH] Simplified GitHub publish dialog

---
 public/res/html/bodyIndex.html         | 22 +++++++---------------
 public/res/providers/githubProvider.js |  8 ++++++--
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/public/res/html/bodyIndex.html b/public/res/html/bodyIndex.html
index d808f18b..d78974f1 100644
--- a/public/res/html/bodyIndex.html
+++ b/public/res/html/bodyIndex.html
@@ -153,13 +153,13 @@
 				<div class="sub-menu collapse collapse-save-as clearfix">
 					<ul class="nav">
 						<li><a class="action-download-md" href="#"><i
-					        class="icon-download"></i> Export as Markdown</a></li>
+					        class="icon-download"></i> As Markdown</a></li>
 						<li><a class="action-download-html" href="#"><i
-					        class="icon-download"></i> Export as HTML</a></li>
+					        class="icon-download"></i> As HTML</a></li>
 						<li><a class="action-download-template" href="#"><i
-					        class="icon-download"></i> Export using template</a></li>
+					        class="icon-download"></i> Using template</a></li>
 						<li><a class="action-download-pdf" href="#"><i
-					        class="icon-download"></i> Export as PDF</a></li>
+					        class="icon-download"></i> As PDF</a></li>
 					</ul>
 				</div>
 
@@ -624,18 +624,10 @@
 					</div>
 					<div class="form-group modal-publish-github">
 						<label class="col-sm-4 control-label"
-							for="input-publish-github-reponame">Repository</label>
+							for="input-publish-github-repo">Repository</label>
 						<div class="col-sm-7">
-							<input type="text" id="input-publish-github-reponame"
-								placeholder="repository-name" class="form-control">
-						</div>
-					</div>
-					<div class="form-group modal-publish-github">
-						<label class="col-sm-4 control-label"
-							for="input-publish-github-username">Username (optional)</label>
-						<div class="col-sm-7">
-							<input type="text" id="input-publish-github-username"
-								placeholder="username" class="form-control">
+							<input type="text" id="input-publish-github-repo"
+								placeholder="Repository name or URL" class="form-control">
 						</div>
 					</div>
 					<div class="form-group modal-publish-github">
diff --git a/public/res/providers/githubProvider.js b/public/res/providers/githubProvider.js
index f732d0e0..bec0ce94 100644
--- a/public/res/providers/githubProvider.js
+++ b/public/res/providers/githubProvider.js
@@ -19,13 +19,17 @@ define([
 
     githubProvider.newPublishAttributes = function(event) {
         var publishAttributes = {};
-        publishAttributes.repository = utils.getInputTextValue("#input-publish-github-reponame", event);
-        publishAttributes.username = utils.getInputTextValue("#input-publish-github-username");
+        publishAttributes.repository = utils.getInputTextValue("#input-publish-github-repo", event);
         publishAttributes.branch = utils.getInputTextValue("#input-publish-github-branch", event);
         publishAttributes.path = utils.getInputTextValue("#input-publish-file-path", event);
         if(event.isPropagationStopped()) {
             return undefined;
         }
+		var parsedRepository = publishAttributes.repository.match(/[\/:]?([^\/:]+)\/([^\/]+?)(?:\.git)?$/);
+		if(parsedRepository) {
+			publishAttributes.repository = parsedRepository[2];
+			publishAttributes.username = parsedRepository[1];
+		}
         return publishAttributes;
     };