aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskaegi2011-05-16 22:47:45 (EDT)
committerBoris Bokowski2011-05-19 10:48:12 (EDT)
commit25fb60f378a6a8b09a7fa2f6719c87c018103c88 (patch)
treedf524f4df947e40209986e286c44900d7782582f
parentd8f93bed39c8851f4d19620c6edbe4393e297d46 (diff)
downloadorg.eclipse.orion.client-25fb60f378a6a8b09a7fa2f6719c87c018103c88.zip
org.eclipse.orion.client-25fb60f378a6a8b09a7fa2f6719c87c018103c88.tar.gz
org.eclipse.orion.client-25fb60f378a6a8b09a7fa2f6719c87c018103c88.tar.bz2
Bug 346025 - [client] Fix user profile css and file layoutv20110516-1749-fixes-20110519-1147
-rw-r--r--bundles/org.eclipse.orion.client.core/static/js/commands.js2
-rw-r--r--bundles/org.eclipse.orion.client.core/static/js/globalCommands.js2
-rwxr-xr-xbundles/org.eclipse.orion.client.users.ui/static/manage-users.css17
-rw-r--r--bundles/org.eclipse.orion.client.users.ui/static/profile/js/UsersList.js4
-rwxr-xr-xbundles/org.eclipse.orion.client.users.ui/static/profile/manage-users.css17
-rw-r--r--bundles/org.eclipse.orion.client.users.ui/static/profile/manage-users.html (renamed from bundles/org.eclipse.orion.client.users.ui/static/manage-users.html)8
-rwxr-xr-xbundles/org.eclipse.orion.client.users.ui/static/profile/user-profile.css17
-rw-r--r--bundles/org.eclipse.orion.client.users.ui/static/profile/user-profile.html (renamed from bundles/org.eclipse.orion.client.users.ui/static/user-profile.html)16
-rw-r--r--bundles/org.eclipse.orion.client.users.ui/static/profile/userservicePlugin.html2
-rwxr-xr-xbundles/org.eclipse.orion.client.users.ui/static/user-profile.css17
10 files changed, 51 insertions, 51 deletions
diff --git a/bundles/org.eclipse.orion.client.core/static/js/commands.js b/bundles/org.eclipse.orion.client.core/static/js/commands.js
index 3287cab..617b6c7 100644
--- a/bundles/org.eclipse.orion.client.core/static/js/commands.js
+++ b/bundles/org.eclipse.orion.client.core/static/js/commands.js
@@ -379,7 +379,7 @@ eclipse.CommandService = (function() {
generateSeparatorImage: function() {
var sep = new Image();
// TODO should get this from CSS
- sep.src = "images/sep.gif";
+ sep.src = "/images/sep.gif";
dojo.addClass(sep, "commandImage");
dojo.addClass(sep, "commandSeparator");
return sep;
diff --git a/bundles/org.eclipse.orion.client.core/static/js/globalCommands.js b/bundles/org.eclipse.orion.client.core/static/js/globalCommands.js
index 31469ab..65cf15a 100644
--- a/bundles/org.eclipse.orion.client.core/static/js/globalCommands.js
+++ b/bundles/org.eclipse.orion.client.core/static/js/globalCommands.js
@@ -95,7 +95,7 @@ eclipse.globalCommandUtils.generateUserInfo = function(userName, userStatusText)
label: "Profile",
onClick:
dojo.hitch(this,
- function(){window.location = "/user-profile.html#/users/" + userName;})
+ function(){window.location = "/profile/user-profile.html#/users/" + userName;})
});
newMenu.addChild(menuitem2);
diff --git a/bundles/org.eclipse.orion.client.users.ui/static/manage-users.css b/bundles/org.eclipse.orion.client.users.ui/static/manage-users.css
deleted file mode 100755
index 54a8c68..0000000
--- a/bundles/org.eclipse.orion.client.users.ui/static/manage-users.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@import "org.dojotoolkit/dojo/resources/dojo.css";
-
-@import "org.dojotoolkit/dijit/themes/nihilo/nihilo.css";
-
-@import "org.dojotoolkit/dijit/themes/nihilo/layout/BorderContainer.css";
-
-@import "org.dojotoolkit/dijit/themes/nihilo/form/Common.css";
-
-@import "org.dojotoolkit/dijit/themes/nihilo/form/Button.css";
-
-@import "ide.css";
-
-@import "commands.css";
-
-@import "profile/css/userprofile.css";
-
-@import "breadcrumbs.css"; \ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.users.ui/static/profile/js/UsersList.js b/bundles/org.eclipse.orion.client.users.ui/static/profile/js/UsersList.js
index e9e6520..da5daf4 100644
--- a/bundles/org.eclipse.orion.client.users.ui/static/profile/js/UsersList.js
+++ b/bundles/org.eclipse.orion.client.users.ui/static/profile/js/UsersList.js
@@ -89,7 +89,7 @@ eclipse.UsersRenderer = (function() {
col = document.createElement('td');
div = dojo.create("div", {style: "padding-left: 5px; padding-right: 5px; ; padding-top: 5px; padding-bottom: 5px"}, col, "only");
- link = dojo.create("a", {className: "navlinkonpage", href: "/user-profile.html#" + item.Location}, div, "last");
+ link = dojo.create("a", {className: "navlinkonpage", href: "/profile/user-profile.html#" + item.Location}, div, "last");
dojo.place(document.createTextNode(item.login), link, "only");
return col;
break;
@@ -198,7 +198,7 @@ eclipse._UsersList = (function() {
},
getUserTab : function(userName) {
- return tab = "<a class=\"navlinkonpage\" href=\"/user-profile.html#/users/" + userName
+ return tab = "<a class=\"navlinkonpage\" href=\"/profile/user-profile.html#/users/" + userName
+ "\">" + userName + "</a>";
},
reloadUsers : function() {
diff --git a/bundles/org.eclipse.orion.client.users.ui/static/profile/manage-users.css b/bundles/org.eclipse.orion.client.users.ui/static/profile/manage-users.css
new file mode 100755
index 0000000..614ea42
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.users.ui/static/profile/manage-users.css
@@ -0,0 +1,17 @@
+@import "../org.dojotoolkit/dojo/resources/dojo.css";
+
+@import "../org.dojotoolkit/dijit/themes/nihilo/nihilo.css";
+
+@import "../org.dojotoolkit/dijit/themes/nihilo/layout/BorderContainer.css";
+
+@import "../org.dojotoolkit/dijit/themes/nihilo/form/Common.css";
+
+@import "../org.dojotoolkit/dijit/themes/nihilo/form/Button.css";
+
+@import "../css/ide.css";
+
+@import "../css/commands.css";
+
+@import "css/userprofile.css";
+
+@import "../css/breadcrumbs.css"; \ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.users.ui/static/manage-users.html b/bundles/org.eclipse.orion.client.users.ui/static/profile/manage-users.html
index 711a4a0..a6505e7 100644
--- a/bundles/org.eclipse.orion.client.users.ui/static/manage-users.html
+++ b/bundles/org.eclipse.orion.client.users.ui/static/profile/manage-users.html
@@ -42,10 +42,10 @@
<script src="/js/commands.js"></script>
<script src="/js/explorer.js"></script>
<!--Profile logic -->
-<script type="text/javascript" src="/profile/js/UsersService.js"></script>
-<script type="text/javascript" src="/profile/js/UsersList.js"></script>
-<script type="text/javascript" src="/profile/js/manage-users.js"></script>
-<script type="text/javascript" src="/profile/widgets/NewUserDialog.js"></script>
+<script type="text/javascript" src="js/UsersService.js"></script>
+<script type="text/javascript" src="js/UsersList.js"></script>
+<script type="text/javascript" src="js/manage-users.js"></script>
+<script type="text/javascript" src="widgets/NewUserDialog.js"></script>
</head>
<body style="height: 100%" class="nihilo">
<div dojoType="dijit.layout.BorderContainer" design="headline"
diff --git a/bundles/org.eclipse.orion.client.users.ui/static/profile/user-profile.css b/bundles/org.eclipse.orion.client.users.ui/static/profile/user-profile.css
new file mode 100755
index 0000000..315d977
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.users.ui/static/profile/user-profile.css
@@ -0,0 +1,17 @@
+@import "../org.dojotoolkit/dojo/resources/dojo.css";
+
+@import "../org.dojotoolkit/dijit/themes/nihilo/nihilo.css";
+
+@import "../org.dojotoolkit/dijit/themes/nihilo/layout/BorderContainer.css";
+
+@import "../org.dojotoolkit/dijit/themes/nihilo/form/Common.css";
+
+@import "../org.dojotoolkit/dijit/themes/nihilo/form/Button.css";
+
+@import "../css/ide.css";
+
+@import "css/userprofile.css";
+
+@import "../css/commands.css";
+
+@import "../css/breadcrumbs.css"; \ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.users.ui/static/user-profile.html b/bundles/org.eclipse.orion.client.users.ui/static/profile/user-profile.html
index a5684e3..e16ae23 100644
--- a/bundles/org.eclipse.orion.client.users.ui/static/user-profile.html
+++ b/bundles/org.eclipse.orion.client.users.ui/static/profile/user-profile.html
@@ -35,16 +35,16 @@
<script type="text/javascript" src="/js/auth.js"></script>
<!-- Extension Registry -->
-<script src="js/serviceregistry.js"></script>
-<script src="js/pluginregistry.js"></script>
-<script src="js/commands.js"></script>
-<script src="js/searchClient.js"></script>
-<script src="js/preferences.js"></script>
+<script src="/js/serviceregistry.js"></script>
+<script src="/js/pluginregistry.js"></script>
+<script src="/js/commands.js"></script>
+<script src="/js/searchClient.js"></script>
+<script src="/js/preferences.js"></script>
<!-- Eclipse Application Services -->
<!--Profile logic -->
-<script type="text/javascript" src="/profile/js/UsersService.js"></script>
-<script type="text/javascript" src="/profile/js/usersClient.js"></script>
-<script type="text/javascript" src="/profile/js/profile.js"></script>
+<script type="text/javascript" src="js/UsersService.js"></script>
+<script type="text/javascript" src="js/usersClient.js"></script>
+<script type="text/javascript" src="js/profile.js"></script>
</head>
<body style="height: 100%" class="nihilo">
<div dojoType="dijit.layout.BorderContainer" design="headline"
diff --git a/bundles/org.eclipse.orion.client.users.ui/static/profile/userservicePlugin.html b/bundles/org.eclipse.orion.client.users.ui/static/profile/userservicePlugin.html
index 37a410a..725ae29 100644
--- a/bundles/org.eclipse.orion.client.users.ui/static/profile/userservicePlugin.html
+++ b/bundles/org.eclipse.orion.client.users.ui/static/profile/userservicePlugin.html
@@ -5,7 +5,7 @@
<script type="text/javascript" src="/openajax/release/all/OpenAjaxManagedHub-all.js"></script>
<script type="text/javascript" src="/js/plugin.js"></script>
<script type="text/javascript" src="/js/globalCommands.js"></script>
- <script type="text/javascript" src="/profile/js/UsersService.js"></script>
+ <script type="text/javascript" src="js/UsersService.js"></script>
<script type="text/javascript"
src="/org.dojotoolkit/dojo/dojo.js.uncompressed.js"></script>
<!--Authentication -->
diff --git a/bundles/org.eclipse.orion.client.users.ui/static/user-profile.css b/bundles/org.eclipse.orion.client.users.ui/static/user-profile.css
deleted file mode 100755
index 7f526c6..0000000
--- a/bundles/org.eclipse.orion.client.users.ui/static/user-profile.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@import "org.dojotoolkit/dojo/resources/dojo.css";
-
-@import "org.dojotoolkit/dijit/themes/nihilo/nihilo.css";
-
-@import "org.dojotoolkit/dijit/themes/nihilo/layout/BorderContainer.css";
-
-@import "org.dojotoolkit/dijit/themes/nihilo/form/Common.css";
-
-@import "org.dojotoolkit/dijit/themes/nihilo/form/Button.css";
-
-@import "ide.css";
-
-@import "profile/css/userprofile.css";
-
-@import "commands.css";
-
-@import "breadcrumbs.css"; \ No newline at end of file