Author: jonathan
Date: Wed May 7 12:41:33 2008
New Revision: 16630
Log:
Taskbar improvements:
- Keep Administrative Tasks around when an admin is acting like a user, with
the "act as admin" task.
- Normalize "service" vs. "mashup" terminology. (Mashup being the service plus
any uis, data, etc.)
- Experimentally added a help icon for "Act as a" task tooltips.
- Some improvements to logical task ordering.
Added:
trunk/mashup/java/modules/www/images/help.gif (contents, props changed)
Modified:
trunk/mashup/java/modules/www/css/styles.css
trunk/mashup/java/modules/www/taskbar.jsp
Modified: trunk/mashup/java/modules/www/css/styles.css
==============================================================================
--- trunk/mashup/java/modules/www/css/styles.css (original)
+++ trunk/mashup/java/modules/www/css/styles.css Wed May 7 12:41:33 2008
@@ -711,6 +711,20 @@
display: none;
}
+.help {
+ display:inline;
+ width:12px;
+ height:12px;
+ background-image: url(../images/help.gif);
+ position:relative;
+ top:2px;
+}
+
+.help img {
+ width:12px;
+ height:12px;
+}
+
.tooltip {
width: 200px;
color: #000;
Added: trunk/mashup/java/modules/www/images/help.gif
==============================================================================
Binary file. No diff available.
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Wed May 7 12:41:33 2008
@@ -57,20 +57,16 @@
(author != null && author.equalsIgnoreCase(currentUser))) &&
(paramMashupServiceName != null)) { %>
<li id="service-status">
- Service status not available
-</li>
-<li id="edit-service">
- <a
href="editor.jsp?action=edit&mashup=<%=paramPath%>&bounceback=<%=thisPage%>">Edit
this mashup</a>
+ Mashup status not available
</li>
-
<script type="text/javascript">
function deleteServiceCallback() {
window.location = "index.jsp";
}
function deleteService() {
- var confirmation = confirm("You are about to permanently delete the
'<%=paramMashupServiceName%>' service. Are you sure?")
+ var confirmation = confirm("You are about to permanently delete the
'<%=paramMashupServiceName%>' mashup. Are you sure?")
if (confirmation) {
wso2.mashup.services.deleteService('<%=paramPath%>',
deleteServiceCallback);
@@ -90,9 +86,9 @@
}
if (response == "true") {
- alert("Successfully re deployed the service");
+ alert("Successfully redeployed the service");
} else {
- alert("Re deployment failed.");
+ alert("Redeployment failed.");
}
}
@@ -107,12 +103,16 @@
<script language="javascript" src="js/utils.js"
type="text/javascript"></script>
<li id="redeploy-service">
<a href="#"
- onclick="redeployService();">Re deploy this service</a>
+ onclick="redeployService();">Redeploy this service</a>
+</li>
+
+<li id="edit-service">
+ <a
href="editor.jsp?action=edit&mashup=<%=paramPath%>&bounceback=<%=thisPage%>">Edit
this mashup</a>
</li>
<li id="delete-service">
<a href="#"
- onclick="deleteService();">Delete this service</a>
+ onclick="deleteService();">Delete this mashup</a>
</li>
<script type="text/javascript">
@@ -133,7 +133,7 @@
"Service stopped. [<a href='#'
onclick='WSO2.MashupUtils.handleServiceStartStop(\"<%=paramMashupServiceName%>\",
true, handleServiceStartStopCallback)'>Start</a>]";
//Disabling service sharing
document.getElementById("share-mashup").innerHTML =
- "Service sharing is not available";
+ "Mashup sharing is not available";
}
}
@@ -163,14 +163,14 @@
"Service stopped. [<a href='#'
onclick='WSO2.MashupUtils.handleServiceStartStop(\"<%=paramMashupServiceName%>\",
true, handleServiceStartStopCallback)'>Start</a>]";
//Disabling service sharing
document.getElementById("share-mashup").innerHTML =
- "Service sharing is not available";
+ "Mashup sharing is not available";
}
}
wso2.mashup.services.listServiceData('<%=paramMashupServiceName%>',
listServiceDataCallback);
</script>
<li id="share-mashup">
- Service sharing is not available
+ Mashup sharing is not available
</li>
<%
}
@@ -179,7 +179,7 @@
<li>
<a href="#"
onclick="WSO2.MashupUtils.showCreateMashupDialog('<%=currentUser%>');">Create a
- new service</a>
+ new mashup</a>
</li>
<li>
@@ -210,12 +210,6 @@
</form>
</div>
<% } %>
-<%
- if (RegistryUtils.isPseudoUser(userRegistry)) { %>
-<li>
- <a href="admin_act_user.jsp?enable=false">Revert to Administrator</a>
-</li>
-<% } %>
<!--
<li>
<a href="#">Add virtual directory**</a>
@@ -239,7 +233,7 @@
</div>
-<% if (RegistryUtils.isAdminRole(userRegistry)) { %>
+<% if (RegistryUtils.isAdminRole(userRegistry) ||
RegistryUtils.isPseudoUser(userRegistry)) { %>
<div class="rbroundbox">
<div class="rbtop">
<div class="bg">
@@ -250,6 +244,16 @@
<!--Will only be available for administrators -->
<ul>
<li>
+ <% if (RegistryUtils.isPseudoUser(userRegistry)) { %>
+ <a
href="admin_act_user.jsp?enable=false&bounceback=<%=thisPage%>">Act as an
Administrator</a>
+ <a class="help" title="Your account has Administrator
priveleges, but you are currently acting in the role of a normal user. Change
to the role of an Administrator by selecting 'Act as an Administrator'."><img
src="images/blank.gif" /></a>
+ <% } else { %>
+ <a
href="admin_act_user.jsp?enable=true&bounceback=<%=thisPage%>">Act as a User</a>
+ <a class="help" title="Your account has Administrator
priveleges, which has great power but consequently demands great
responsibility. You can act safely in the role of a normal User by selecting
'Act as a User'."><img src="images/blank.gif"/></a>
+ <% } %>
+ </li>
+ <% if (RegistryUtils.isAdminRole(userRegistry)) { %>
+ <li>
<a href="add_user.jsp?firstcall=true">Add User</a>
</li>
<li>
@@ -263,11 +267,9 @@
<% } %>
</li>
<li>
- <a href="admin_act_user.jsp?enable=true">Act as User</a>
- </li>
- <li>
<a href="log_reader.jsp">View Server Log</a>
</li>
+ <% } %>
</ul>
</div>
<div class="rbbot">
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
