summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAnton McConville2012-01-27 11:19:43 (EST)
committer Szymon Brandys2012-01-27 11:19:43 (EST)
commit82724d05e61a8fc0795ae4acfc7975438c239ab4 (patch)
tree9b38a465f7ccdd9061fe8be1c0b3bdfb119b6b43
parentbc0e8a3662c717172413321d6a7be62044272df9 (diff)
downloadorg.eclipse.orion.client-82724d05e61a8fc0795ae4acfc7975438c239ab4.zip
org.eclipse.orion.client-82724d05e61a8fc0795ae4acfc7975438c239ab4.tar.gz
org.eclipse.orion.client-82724d05e61a8fc0795ae4acfc7975438c239ab4.tar.bz2
CSS updated along with settings.js and gitRepositoryExplorer.js
-rw-r--r--bundles/org.eclipse.orion.client.core/web/settings/settings.css18
-rw-r--r--bundles/org.eclipse.orion.client.core/web/settings/settings.js30
-rw-r--r--bundles/org.eclipse.orion.client.git/web/git/git-repository.css11
-rw-r--r--bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js20
4 files changed, 56 insertions, 23 deletions
diff --git a/bundles/org.eclipse.orion.client.core/web/settings/settings.css b/bundles/org.eclipse.orion.client.core/web/settings/settings.css
index 8aaa327..9af34d5 100644
--- a/bundles/org.eclipse.orion.client.core/web/settings/settings.css
+++ b/bundles/org.eclipse.orion.client.core/web/settings/settings.css
@@ -107,6 +107,8 @@ ul,menu,dir {
}
.settings {
+ min-width:1000px;
+ max-width:1300px;
padding-left: 20px;
padding-right: 40px;
}
@@ -125,6 +127,13 @@ ul,menu,dir {
margin: 0;
}
+.oldLink {
+ float: left;
+ color: #666;
+ margin: 2px;
+ padding-left: 5px;
+}
+
.sectionProgress {
float: left; font-size : 1.2em; font-weight : bold; color : #666;
margin-left: 2px;
@@ -311,6 +320,8 @@ list,grid {
.stretch {
float: left;
position: relative;
+ white-space:normal;
+ max-width:600px;
}
list>*,grid>* {
@@ -352,6 +363,8 @@ list>*,grid>* {
font-size: 13px;
white-space: normal;
padding-right: 10px;
+ min-width:100px;
+ max-width:200px;
}
.plugin-delete {
@@ -376,6 +389,7 @@ list>*,grid>* {
padding-right: 15px;
}
-.plugin-links-trailing {
+.plugin-links {
padding-right: 7px;
-} \ No newline at end of file
+}
+
diff --git a/bundles/org.eclipse.orion.client.core/web/settings/settings.js b/bundles/org.eclipse.orion.client.core/web/settings/settings.js
index 0f86c86..e00b833 100644
--- a/bundles/org.eclipse.orion.client.core/web/settings/settings.js
+++ b/bundles/org.eclipse.orion.client.core/web/settings/settings.js
@@ -283,6 +283,10 @@ function pluginUrlBlur(){
}
}
+function createpropertiesTable(){
+ // TODO: work in progress
+}
+
/* showPlugins - iterates over the plugin array, reads
meta-data and creates a dom entry for each plugin.
@@ -315,6 +319,8 @@ function showPlugins( event ){
dojo.create( "div", item, titleWrapper );
+ dojo.create( "a", { id: "oldlink", href:"../plugin/list.html", innerHTML:"Services", "class":"oldLink", onclick:"addNewPlugins()"}, titleWrapper );
+
dojo.create( "div", { id: "addpluginscontrol", innerHTML:"Add Plugins", "class":"additions", onclick:"addNewPlugins()"}, titleWrapper );
/* The plugins page has a slightly different layout from the other settings pages - so this content
@@ -351,18 +357,15 @@ function showPlugins( event ){
var name = derivePluginNameFromLocation( location );
var extensionListItem = dojo.create( "div", { "class":"plugin-list-item" }, list );
- var horizontalBox = dojo.create( "div", null, extensionListItem );
- var zippy = dojo.create( "div", { "class":"container" }, horizontalBox );
- var icon = dojo.create( "img", { "class":"plugin-icon", "src": iconSource }, horizontalBox );
- var detailsView = dojo.create( "div", { "class":"stretch", "src": iconSource }, horizontalBox );
+ var container = dojo.create( "div", { "class":"container" }, extensionListItem );
+ var icon = dojo.create( "img", { "class":"plugin-icon", "src": iconSource }, container );
+ var detailsView = dojo.create( "div", { "class":"stretch" }, container );
var title = dojo.create( "span", { "class":"plugin-title", innerHTML: name }, detailsView );
dojo.create( "div", null, detailsView );
var description = dojo.create( "span", { "class":"plugin-description", innerHTML: "A plugin for Eclipse Orion" }, detailsView );
- dojo.create( "a", { "class":"plugin-links-trailing", href: location, innerHTML: "Plugin Website" }, detailsView );
+ dojo.create( "a", { "class":"plugin-link", href: location, innerHTML: "Plugin Website" }, detailsView );
- dojo.create( "div", null, horizontalBox );
-
- var removeButton = dojo.create( "button", { "id":location, "class":"plugin-delete", innerHTML: "Remove", onClick: "removePlugin(event)" }, horizontalBox );
+ var removeButton = dojo.create( "button", { "id":location, "class":"plugin-delete", innerHTML: "Remove", onClick: "removePlugin(event)" }, container );
}
}
@@ -479,6 +482,13 @@ function drawUserInterface( settings ){
var nav = dojo.byId( 'navbar' );
selectCategory({currentTarget: nav.childNodes[1]});
+
+ /* Adjusting width of mainNode - the css class is shared
+ so tailoring it for the preference apps */
+
+ var mainNode = dojo.byId( "mainNode" );
+ dojo.style( mainNode, "max-width", "700px" );
+ dojo.style( mainNode, "min-width", "500px" );
}
@@ -545,7 +555,7 @@ define(['require', 'dojo', 'orion/bootstrap', 'orion/status', 'orion/commands',
// Register services
var dialogService = new mDialogs.DialogService(serviceRegistry);
- preferencesStatusService = new mStatus.StatusReportingService(serviceRegistry, "statusPane", "notifications", "notificationArea");
+ preferencesStatusService = new mStatus.StatusReportingService(serviceRegistry, "statusPane", "notifications");
var commandService = new mCommands.CommandService({serviceRegistry: serviceRegistry});
var siteService = new mSiteService.SiteService(serviceRegistry);
@@ -560,4 +570,4 @@ define(['require', 'dojo', 'orion/bootstrap', 'orion/status', 'orion/commands',
preferencesStatusService.setMessage("");
});
});
-}); \ No newline at end of file
+});
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 9e4cf14..cba9e2e 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
@@ -2,7 +2,8 @@
@import "../org.dojotoolkit/dijit/themes/nihilo/nihilo.css";
-@import "../org.dojotoolkit/dijit/themes/nihilo/layout/BorderContainer.css";
+@import
+ "../org.dojotoolkit/dijit/themes/nihilo/layout/BorderContainer.css";
@import "../org.dojotoolkit/dijit/themes/nihilo/form/Common.css";
@@ -60,4 +61,12 @@
.git-table {
padding-top: 15px;
padding-top: 15px;
+}
+
+.tag-description {
+ font-size: 13px;
+ white-space: normal;
+ padding-right: 10px;
+ min-width: 100px;
+ max-width: 600px;
} \ No newline at end of file
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 0f493a2..49fe15a 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
@@ -256,7 +256,7 @@ exports.GitRepositoryExplorer = (function() {
var title = dojo.create( "span", { "class":"plugin-title"}, detailsView );
if (links){
- link = dojo.create("a", {className: "navlinkonpage", href: "/git/git-repository.html#" + repository.Location}, title);
+ link = dojo.create("a", {"class": "navlinkonpage", href: "/git/git-repository.html#" + repository.Location}, title);
dojo.place(document.createTextNode(repository.Name), link);
} else {
dojo.place(document.createTextNode(repository.Name), title);
@@ -358,7 +358,7 @@ exports.GitRepositoryExplorer = (function() {
var titleWrapper = dojo.create( "div", {"class":"pluginwrapper"}, tableNode );
var item = { id: "branchHeader", "class":"pluginTitle", innerHTML: "Branches" };
dojo.create( "div", item, titleWrapper );
- dojo.create( "div", { id: "branchSectionProgress", className: "sectionProgress", innerHTML: "..."}, titleWrapper );
+ dojo.create( "div", { id: "branchSectionProgress", "class": "sectionProgress", innerHTML: "..."}, titleWrapper );
dojo.create( "div", { id: "branchSectionActionsArea", "class":"additions-light"}, titleWrapper );
var subItem = { id: "branchSubHeader", "class":"pluginSubTitle", innerHTML: (mode === "full" ? "" : "<a href=\"/git/git-repository.html#" + branchLocation + "\">See all branches</a></h2>")};
dojo.create( "div", subItem, tableNode );
@@ -421,7 +421,7 @@ exports.GitRepositoryExplorer = (function() {
var titleWrapper = dojo.create( "div", {"class":"pluginwrapper"}, tableNode );
var item = { id: "remoteBranchHeader", "class":"pluginTitle", innerHTML: "Remote Branches" };
dojo.create( "div", item, titleWrapper );
- dojo.create( "div", { id: "remoteBranchSectionProgress", className: "sectionProgress", innerHTML: "..."}, titleWrapper );
+ dojo.create( "div", { id: "remoteBranchSectionProgress", "class": "sectionProgress", innerHTML: "..."}, titleWrapper );
var content =
'<div class="git-table">' +
@@ -506,7 +506,7 @@ exports.GitRepositoryExplorer = (function() {
var titleWrapper = dojo.create( "div", {"class":"pluginwrapper"}, tableNode );
var item = { id: "commitHeader", "class":"pluginTitle", innerHTML: "Commits" };
dojo.create( "div", item, titleWrapper );
- dojo.create( "div", { id: "commitSectionProgress", className: "sectionProgress", innerHTML: "..."}, titleWrapper );
+ dojo.create( "div", { id: "commitSectionProgress", "class": "sectionProgress", innerHTML: "..."}, titleWrapper );
dojo.create( "div", { id: "commitSectionActionsArea", "class":"additions-light"}, titleWrapper );
var subItem = { id: "commitSubHeader", "class":"pluginSubTitle"};
dojo.create( "div", subItem, tableNode );
@@ -534,7 +534,7 @@ exports.GitRepositoryExplorer = (function() {
dojo.byId("commitHeader").innerHTML = "Commits for \"" + currentBranch.Name + "\" branch";
var subHeader = dojo.byId("commitSubHeader");
- var seeMoreLink = dojo.create("a", {className: "navlinkonpage", href: "/git/git-log.html#" + currentBranch.CommitLocation + "?page=1"}, subHeader);
+ var seeMoreLink = dojo.create("a", {"class": "navlinkonpage", href: "/git/git-log.html#" + currentBranch.CommitLocation + "?page=1"}, subHeader);
dojo.place(document.createTextNode("See the full log"), seeMoreLink);
if (currentBranch.RemoteLocation[0]){
@@ -631,7 +631,7 @@ exports.GitRepositoryExplorer = (function() {
var detailsView = dojo.create( "div", { "class":"stretch"}, horizontalBox );
- var titleLink = dojo.create("a", {className: "plugin-title navlinkonpage", href: "/git/git-commit.html#" + commit.Location + "?page=1&pageSize=1"}, detailsView);
+ var titleLink = dojo.create("a", {"class": "plugin-title navlinkonpage", href: "/git/git-commit.html#" + commit.Location + "?page=1&pageSize=1"}, detailsView);
dojo.place(document.createTextNode(commit.Message), titleLink);
var tooltipDialog = new orion.git.widgets.CommitTooltipDialog({
@@ -707,7 +707,7 @@ exports.GitRepositoryExplorer = (function() {
var titleWrapper = dojo.create( "div", {"class":"pluginwrapper"}, tableNode );
var item = { id: "tagHeader", "class":"pluginTitle", innerHTML: ("Tags" + (mode === "full" ? "" : " (5 most recent)"))};
dojo.create( "div", item, titleWrapper );
- dojo.create( "div", { id: "tagSectionProgress", className: "sectionProgress", innerHTML: "..."}, titleWrapper );
+ dojo.create( "div", { id: "tagSectionProgress", "class": "sectionProgress", innerHTML: "..."}, titleWrapper );
var subItem = { id: "tagSubHeader", "class":"pluginSubTitle", innerHTML: (mode === "full" ? "" : "<a href=\"/git/git-repository.html#" + tagLocation + "\">See all tags</a>")};
dojo.create( "div", subItem, tableNode );
@@ -756,10 +756,10 @@ exports.GitRepositoryExplorer = (function() {
dojo.create( "div", null, detailsView );
if (tag.Commit){
- var description = dojo.create( "span", { "class":"plugin-description"}, detailsView );
+ var description = dojo.create( "span", { "class":"tag-description"}, detailsView );
var commit = tag.Commit.Children[0];
- var link = dojo.create("a", {className: "navlinkonpage", href: "/git/git-commit.html#" + commit.Location + "?page=1&pageSize=1"}, description);
+ var link = dojo.create("a", {"class": "navlinkonpage", href: "/git/git-commit.html#" + commit.Location + "?page=1&pageSize=1"}, description);
dojo.place(document.createTextNode(commit.Message), link);
dojo.place(document.createTextNode(" by " + commit.AuthorName + " on " +
dojo.date.locale.format(new Date(commit.Time), {formatLength: "short"})), description, "last");
@@ -812,7 +812,7 @@ exports.GitRepositoryExplorer = (function() {
var titleWrapper = dojo.create( "div", {"class":"pluginwrapper"}, tableNode );
var item = { id: "remoteHeader", "class":"pluginTitle", innerHTML: "Remotes" };
dojo.create( "div", item, titleWrapper );
- dojo.create( "div", { id: "remoteSectionProgress", className: "sectionProgress", innerHTML: "..."}, titleWrapper );
+ dojo.create( "div", { id: "remoteSectionProgress", "class": "sectionProgress", innerHTML: "..."}, titleWrapper );
dojo.create( "div", { id: "remoteSectionActionsArea", "class":"additions-light"}, titleWrapper );
this.registry.getService("orion.page.command").registerCommandContribution("eclipse.addRemote", 2000, "remoteSectionActionsArea");