aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis Windatt2013-11-21 16:46:01 (EST)
committerGerrit Code Review @ Eclipse.org2013-11-26 17:05:05 (EST)
commita0e61606c0f848669896cf497be9578106446620 (patch)
tree5e8304b9fe755e87328895ba969519e1949c5bd4
parent41b2d8252ca5923ebabf50926f6747389fd80535 (diff)
downloadorg.eclipse.orion.client-a0e61606c0f848669896cf497be9578106446620.zip
org.eclipse.orion.client-a0e61606c0f848669896cf497be9578106446620.tar.gz
org.eclipse.orion.client-a0e61606c0f848669896cf497be9578106446620.tar.bz2
Bug 422293 - Update git repository explorer look and feel forv20131126-2205refs/changes/98/18698/5
consistency and clarity Change-Id: Ie66d0f772c7d4c8e4504afce5f337e766c233541 Signed-off-by: Curtis Windatt <cwindatt@ca.ibm.com>
-rw-r--r--bundles/org.eclipse.orion.client.git/web/git/git-repository.css4
-rw-r--r--bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js46
2 files changed, 30 insertions, 20 deletions
diff --git a/bundles/org.eclipse.orion.client.git/web/git/git-repository.css b/bundles/org.eclipse.orion.client.git/web/git/git-repository.css
index 41869cd..f334f1b 100644
--- a/bundles/org.eclipse.orion.client.git/web/git/git-repository.css
+++ b/bundles/org.eclipse.orion.client.git/web/git/git-repository.css
@@ -27,3 +27,7 @@
.activeBranch {
font-weight: bold;
}
+
+.gitPanel .sectionWrapper {
+ margin-top: 15px;
+}
diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js b/bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js
index c47c765..389fc2b 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js
@@ -410,7 +410,6 @@ exports.GitRepositoryExplorer = (function() {
}
var contentParent = document.createElement("div");
- contentParent.className = "sectionTable";
tableNode.appendChild(contentParent);
contentParent.innerHTML = '<div id="repositoryNode" class="mainPadding"></div>'; //$NON-NLS-0$
@@ -421,21 +420,18 @@ exports.GitRepositoryExplorer = (function() {
},
renderBeforeItemPopulation : function(i){
- var sectionItem = document.createElement("div");
- sectionItem.className = "sectionTableItem " + ((repositories.length === 1) ? "" : "lightTreeTableRow");
- lib.node("repositoryNode").appendChild(sectionItem);
-
- var horizontalBox = document.createElement("div");
- horizontalBox.style.overflow = "hidden";
- sectionItem.appendChild(horizontalBox);
+ // Title area
+ var repoSection = document.createElement("div");
+ repoSection.className = "sectionWrapper toolComposite";
+ lib.node("repositoryNode").appendChild(repoSection);
- var detailsView = document.createElement("div");
- detailsView.className = "stretch";
- horizontalBox.appendChild(detailsView);
+ var sectionAnchor = document.createElement("div");
+ sectionAnchor.className = "sectionAnchor sectionTitle layoutLeft";
+ repoSection.appendChild(sectionAnchor);
var title = document.createElement("span");
- detailsView.appendChild(title);
-
+ sectionAnchor.appendChild(title);
+
if (links){
var link = document.createElement("a");
link.href = require.toUrl(repoTemplate.expand({resource: repositories[i].Location}));
@@ -447,6 +443,23 @@ exports.GitRepositoryExplorer = (function() {
//create indicator
this.explorer.progressIndicators[i] = new this.explorer.progressIndicator(i, title);
+
+ if (mode === "full"){
+ var actionsArea = document.createElement("div");
+ actionsArea.className = "layoutRight sectionActions";
+ actionsArea.id = "repositoryActionsArea";
+ repoSection.appendChild(actionsArea);
+ that.commandService.renderCommands(that.actionScopeId, actionsArea, repositories[i], that, "tool"); //$NON-NLS-0$
+ }
+
+ // Content area
+ var repoSectionContent = document.createElement("div");
+ repoSectionContent.className = "sectionTable sectionTableItem";
+ lib.node("repositoryNode").appendChild(repoSectionContent);
+
+ var detailsView = document.createElement("div");
+ detailsView.className = "stretch";
+ repoSectionContent.appendChild(detailsView);
var div = document.createElement("div");
detailsView.appendChild(div);
@@ -481,13 +494,6 @@ exports.GitRepositoryExplorer = (function() {
span.id = "commitsState"+i;
span.style.paddingLeft = "10px";
detailsView.appendChild(span);
-
- var actionsArea = document.createElement("div");
- actionsArea.className = "sectionTableItemActions";
- actionsArea.id = "repositoryActionsArea";
- horizontalBox.appendChild(actionsArea);
-
- that.commandService.renderCommands(that.actionScopeId, actionsArea, repositories[i], that, "tool"); //$NON-NLS-0$
}
},