summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-03-22 06:57:53 (EDT)
committerManik Kishore2012-06-19 07:23:00 (EDT)
commit9e9a39116d3673be245951eb1f803495c12378bb (patch)
treea772f7fe82bf258de278d2393d1d2cd0ac27f80e
parentde37d7885aeac6e427babef19348e1eec731f9c4 (diff)
downloadorg.eclipse.stardust.ui.web-9e9a39116d3673be245951eb1f803495c12378bb.zip
org.eclipse.stardust.ui.web-9e9a39116d3673be245951eb1f803495c12378bb.tar.gz
org.eclipse.stardust.ui.web-9e9a39116d3673be245951eb1f803495c12378bb.tar.bz2
Jira-ID: CRNT-20332
1)Moved Style classes from context-portal.css to nirvanaPortal.css 2)Removed references of context-portal.css from .xhtml files 3)Moved footer_bg.png from views-common to portal-common. 4)Removed context-portal.css and toolbar-BG.jpg from views-common project. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54778 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--business-control-center/src/main/resources/META-INF/xhtml/views/categoryTree.xhtml3
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css213
-rw-r--r--portal-common/src/main/resources/META-INF/xhtml/images/footer_bg.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/footer_bg.png)bin2838 -> 2838 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml12
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml3
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/css/context-portal.css379
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/dialogs/switchNotificationTable.xhtml3
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/icons/toolbar-BG.jpgbin356 -> 0 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/participantTree/participantTree.xhtml3
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml3
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml4
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/views/correspondence/correspondenceView.xhtml3
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml3
13 files changed, 214 insertions, 415 deletions
diff --git a/business-control-center/src/main/resources/META-INF/xhtml/views/categoryTree.xhtml b/business-control-center/src/main/resources/META-INF/xhtml/views/categoryTree.xhtml
index 04f557b..9ae8a81 100644
--- a/business-control-center/src/main/resources/META-INF/xhtml/views/categoryTree.xhtml
+++ b/business-control-center/src/main/resources/META-INF/xhtml/views/categoryTree.xhtml
@@ -8,9 +8,6 @@
<html>
<head>
- <link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta>
</head>
<body>
diff --git a/portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css b/portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css
index dad5c47..074367e 100644
--- a/portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css
+++ b/portal-common/src/main/resources/META-INF/xhtml/css/nirvanaPortal.css
@@ -1749,4 +1749,215 @@ table.autoCompTable, table.autoCompTable > tbody > tr, table.autoCompTable > tbo
white-space: normal !important;
}
-/* ********** TOOLTIP2 - END ********** */ \ No newline at end of file
+/* ********** TOOLTIP2 - END ********** */
+
+/******** Style moved from context-portal.css **********/
+
+/* Action Panel */
+
+.actionPanel .iceCmdLnk
+{
+ color: #444444;
+ text-decoration: underline;
+}
+
+.actionPanel .iceCmdLnk -dis
+{
+ color: gray;
+}
+
+.content-area
+{
+ border:1px solid #dbdbdb;
+ height: auto;
+ overflow: auto;
+}
+
+.documentviewer-subpanel
+{
+ padding-top: 10px;
+}
+
+.attachments-panel
+{
+ border: 1px solid #D9D9D9;
+ width: 97%;
+ height: 50px;
+ padding: 3px;
+ margin: 2px;
+}
+
+/* Generic Forms */
+
+.formLabel {
+ width: 75px;
+}
+
+.formLabel a
+{
+ font-weight: bold;
+}
+
+.formInput
+{
+ width: 100%;
+ float: left;
+}
+
+.formInput input,.formInput textarea
+{
+ width: 97%;
+}
+
+/* Chat Messages */
+
+.chat-messageeditor-user0
+{
+ color: #000000;
+}
+
+.chat-messageeditor-user1
+{
+ color: #A80000;
+}
+
+.chat-messageeditor-user2
+{
+ color: #800080;
+}
+
+.chat-messageeditor-user3
+{
+ color: #A80000;
+}
+
+.chat-messageeditor-user4
+{
+ color: #808000;
+}
+
+.chat-messageeditor-user5
+{
+ color: #505050;
+}
+
+.chat-messageeditor-user6
+{
+ color: #A0A0A0;
+}
+
+.chat-messageeditor-user7
+{
+ color: #006666;
+}
+
+.chat-messageeditor-user8
+{
+ color: #003399;
+}
+
+.chat-messageeditor-user9
+{
+ color: #003300;
+}
+
+.chat-messageeditor-user10
+{
+ color: #660000;
+}
+
+.chat-messageeditor-user11
+{
+ color: #666633;
+}
+.chat-messageeditor-user-1
+{
+ color: #006677;
+ font-style: italic;
+}
+
+.chatPartColClass1
+{
+ width: 20%;
+ text-align: center;
+}
+
+.chatPartColClass2
+{
+ text-align: center;
+}
+
+.chatPartColClass3
+{
+ width: 20%;
+ text-align: center;
+}
+
+.pnlBrdrDemo {
+ display: block;
+ float: left;
+ width: 100%;
+}
+
+.pnlBrdrDemo .icePnlBrdrWest {
+ font-weight: lighter;
+ text-align: left;
+ vertical-align: top;
+ width: 200px;
+ min-width: 200px;
+ background: none;
+ padding-right: 10px;
+}
+
+.pnlBrdrDemo .icePnlBrdrCenter {
+ border-left: 1px dotted #CCCCCC;
+ font-weight: lighter;
+ text-align: left;
+ vertical-align: middle;
+ width: 100%;
+ background: none;
+ padding-left: 10px;
+}
+
+.chatSendButtonContainer {
+ background: transparent url(../images/footer_bg.png) repeat-x
+ scroll center top;
+ border-top: 1px solid #CCCCCC;
+ bottom: 0;
+ clear: both;
+ left: 0;
+}
+
+.chatSendButtonContainer input {
+ background: #FFFFFF url(../images/toolbar-BG.jpg) repeat-x scroll
+ center bottom;
+ border-color: #CCCCCC #999999 #999999 #CCCCCC;
+ border-style: solid;
+ border-width: 1px;
+ color: #333333;
+ cursor: pointer;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: normal;
+ margin: 5px;
+ padding: 3px;
+}
+
+.chatMessageEditor {
+ width: 100%;
+ border: 1px solid #CCCCCC;
+ margin-top: 20px;
+}
+
+.chatEntryPanel {
+ background-color: white;
+ border: 1px solid #CCCCCC;
+}
+
+.chatEntryPanelSeries
+{
+ width:100%;
+ height:300px;
+}
+
+/******** context-portal.css Style Ends**********/ \ No newline at end of file
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/footer_bg.png b/portal-common/src/main/resources/META-INF/xhtml/images/footer_bg.png
index e1b006c..e1b006c 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/footer_bg.png
+++ b/portal-common/src/main/resources/META-INF/xhtml/images/footer_bg.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml
index 7a6a193..c5522bd 100644
--- a/views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/common/priorityMultiSelectorTable.xhtml
@@ -12,9 +12,6 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta>
-<link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
</head>
<body>
<c:choose>
@@ -49,13 +46,8 @@
<tr>
<td><ice:outputText value="#{priorityItem.label}" />
</td>
- <td><ice:panelGroup>
- <ice:panelGrid columns="5">
- <ice:graphicImage value="#{priorityItem.icon}"
- width="16px" height="16px" />
- </ice:panelGrid>
- </ice:panelGroup>
- </td>
+ <td><ice:graphicImage value="#{priorityItem.icon}"
+ width="16px" height="16px" /></td>
</tr>
</tbody>
</table>
diff --git a/views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml
index 543e8cd..657e9a0 100644
--- a/views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/criticality/criticalityMultiSelectorTable.xhtml
@@ -12,9 +12,6 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta>
- <link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
</head>
<body>
<c:choose>
diff --git a/views-common/src/main/resources/META-INF/xhtml/css/context-portal.css b/views-common/src/main/resources/META-INF/xhtml/css/context-portal.css
deleted file mode 100644
index 907ecc3..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/css/context-portal.css
+++ /dev/null
@@ -1,379 +0,0 @@
-/* Action Panel */
-
-.actionPanel .iceCmdLnk
-{
- color: #444444;
- text-decoration: underline;
-}
-
-.actionPanel .iceCmdLnk -dis
-{
- color: gray;
-}
-
-.content-area
-{
- border:1px solid #dbdbdb;
- height: auto;
- overflow: auto;
-}
-
-
-.documentviewer-subpanel
-{
- padding-top: 10px;
-}
-
-/* Attachments Panel */
-
-.attachments-panel
-{
- border: 1px solid #D9D9D9;
- width: 97%;
- height: 50px;
- padding: 3px;
- margin: 2px;
-}
-
-/* Drag-n-Drop target */
-
-.dropTargetHover
-{
- background-color: #E1A142;
-}
-
-/* Generic Forms */
-
-.formLabel {
- width: 75px;
-}
-
-.formLabel a
-{
- font-weight: bold;
-}
-
-.formInput
-{
- width: 100%;
- float: left;
-}
-
-.formInput input,.formInput textarea
-{
- width: 97%;
-}
-
-/* Chat Message Editor */
-
-.chat-message-editor
-{
- font-size: 12px;
-}
-
-/* Chat Table */
-
-chat-protocol-table
-{
- padding: 0px;
- margin: 0px;
- border: 1px solid #808080;
- vertical-align: top;
-}
-
-/*.chat-protocol-table-column
-{
- font-size: 12px;
- vertical-align: top;
- padding: 5px;
- padding-left: 3px;
- padding-right: 3px;
- margin: 0px;
- border: 1px;
-}*/
-
-.chat-protocol-table-user-text
-{
- font-size: 10px;
- color: #aaaadd;
- font-weight: bold;
- vertical-align: top;
- background: none;
-}
-
-.chat-protocol-table-time-text
-{
- font-size: 10px;
- color: #aaaadd;
- vertical-align: top;
- background: none;
-}
-
-.chat-protocol-table-message-text
-{
- font-size: 12px;
- vertical-align: top;
- background: none;
-}
-
-.chat-protocol-table-message-text-system
-{
- font-color: #cccccc;
- font-size: 12px;
- font-style: italic;
- vertical-align: top;
- background: none;
-}
-
-.chat-protocol-table-message-text-file
-{
- font-color: #aaaaaa;
- font-size: 12px;
- font-style: italic;
- vertical-align: top;
- background: none;
-}
-
-/* Chat Messages */
-
-.chat-messageeditor-user0
-{
- color: #000000;
-}
-
-.chat-messageeditor-user1
-{
- color: #A80000;
-}
-
-.chat-messageeditor-user2
-{
- color: #800080;
-}
-
-.chat-messageeditor-user3
-{
- color: #A80000;
-}
-
-.chat-messageeditor-user4
-{
- color: #808000;
-}
-
-.chat-messageeditor-user5
-{
- color: #505050;
-}
-
-.chat-messageeditor-user6
-{
- color: #A0A0A0;
-}
-
-.chat-messageeditor-user7
-{
- color: #006666;
-}
-
-.chat-messageeditor-user8
-{
- color: #003399;
-}
-
-.chat-messageeditor-user9
-{
- color: #003300;
-}
-
-.chat-messageeditor-user10
-{
- color: #660000;
-}
-
-.chat-messageeditor-user11
-{
- color: #666633;
-}
-.chat-messageeditor-user-1
-{
- color: #006677;
- font-style: italic;
-}
-
-.chatPartColClass1
-{
- width: 20%;
- text-align: center;
-}
-
-.chatPartColClass2
-{
- text-align: center;
-}
-
-.chatPartColClass3
-{
- width: 20%;
- text-align: center;
-}
-
-/* Criticality filter. */
-.criticFilterClass1
-{
- text-align: left;
-}
-
-.criticFilterClass2
-{
- text-align: center;
-}
-
-/* Chat Notification */
-
-.chat-invitation-message .iceOutTxt
-{
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #a82127;
- text-decoration: none;
-}
-
-.chat-invitation-message .iceOutTxt: hover
-{
- text-decoration: underline;
-}
-
-/* Styles for ice:menuPopup */
-
-.iceMnuPopVrtTopSubMenu {
- background-color: #FCFCFC;
- border-color: #DBDBDB #6B6B6B #6B6B6B #DBDBDB;
- border: thin solid 1px;
- z-index:255;
-}
-
-.iceMnuPopVrtItem a {
- padding-left: 10px;
- padding-right: 3px;
- padding-top: 3px;
- padding-bottom: 3px;
- margin-bottom: 0px;
- font-size: 11px;
-}
-
-.iceMnuPopVrtItem a:hover {
-/* was iceMenu_verticalItem */
- background-color: #4591A1;
- color: #4591A1;
- text-decoration: none;
-}
-
-.iceMnuPopVrtItem a:hover {
- background-color: #DDEAF0;
-}
-
-.iceMnuPopVrtItem-dis {
- width: 160px;
- display: block;
- margin: 2px 0px 2px 0px; !important;
- font-size: 1em;
-}
-
-.iceMnuPopVrtItem-dis .iceCmdLnk-dis {
- border-bottom: 0px; !important;
- margin: 0px 0px 0px 17px;
- font-size: 11px;
-}
-
-.iceMnuItmLabel-dis {
- color: #B9B5AE !important;
-}
-
-.treeClass .iceMnuItmLabel {
- padding-top: 0;
- padding-bottom: 0;
- padding-left: 7px;
- font-weight: normal;
- color: #000000 !important;
-}
-
-.notesTooltip .icePnlTlTip{
- width:200px;
- border:1px solid #FFCC00;
- background: url('../images/notes-background.png') top repeat-x #FFFFE0;
- clear:both;
- font-family:Arial, Helvetica, sans-serif;
- font-size:11px;
- color:#000000;
- overflow: auto;
- height: 300px;
-}
-
-.pnlBrdrDemo {
- display: block;
- float: left;
- width: 100%;
-}
-
-.pnlBrdrDemo .icePnlBrdrWest {
- font-weight: lighter;
- text-align: left;
- vertical-align: top;
- width: 200px;
- min-width: 200px;
- background: none;
- padding-right: 10px;
-}
-
-.pnlBrdrDemo .icePnlBrdrCenter {
- border-left: 1px dotted #CCCCCC;
- font-weight: lighter;
- text-align: left;
- vertical-align: middle;
- width: 100%;
- background: none;
- padding-left: 10px;
-}
-
-.chatSendButtonContainer {
- background: transparent url(../images/icons/footer_bg.png) repeat-x
- scroll center top;
- border-top: 1px solid #CCCCCC;
- bottom: 0;
- clear: both;
- left: 0;
-}
-
-.chatSendButtonContainer input {
- background: #FFFFFF url(../images/icons/toolbar-BG.jpg) repeat-x scroll
- center bottom;
- border-color: #CCCCCC #999999 #999999 #CCCCCC;
- border-style: solid;
- border-width: 1px;
- color: #333333;
- cursor: pointer;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: normal;
- margin: 5px;
- padding: 3px;
-}
-
-.chatMessageEditor {
- width: 100%;
- border: 1px solid #CCCCCC;
- margin-top: 20px;
-}
-
-.chatEntryPanel {
- background-color: white;
- border: 1px solid #CCCCCC;
-}
-
-.chatEntryPanelSeries
-{
- width:100%;
- height:300px;
-}
diff --git a/views-common/src/main/resources/META-INF/xhtml/dialogs/switchNotificationTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/dialogs/switchNotificationTable.xhtml
index a1ca18c..50890f8 100644
--- a/views-common/src/main/resources/META-INF/xhtml/dialogs/switchNotificationTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/dialogs/switchNotificationTable.xhtml
@@ -8,9 +8,6 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta>
-<link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/toolbar-BG.jpg b/views-common/src/main/resources/META-INF/xhtml/images/icons/toolbar-BG.jpg
deleted file mode 100644
index ab37710..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/toolbar-BG.jpg
+++ /dev/null
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/participantTree/participantTree.xhtml b/views-common/src/main/resources/META-INF/xhtml/participantTree/participantTree.xhtml
index 74129cd..661179f 100644
--- a/views-common/src/main/resources/META-INF/xhtml/participantTree/participantTree.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/participantTree/participantTree.xhtml
@@ -29,9 +29,6 @@
</c:otherwise>
</c:choose>
- <link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
<!-- Participant Tree Heading -->
<ice:panelGroup styleClass="heading">
diff --git a/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml b/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml
index e083cd3..ae97bc6 100644
--- a/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/user/participantAutocompleteMultiSelectorUserTable.xhtml
@@ -12,9 +12,6 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta>
- <link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
</head>
<body>
<c:choose>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml
index 0fcc7cc..695cff6 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/chat/chatView.xhtml
@@ -9,10 +9,6 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta>
- <link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
-
<title>Chat Panel</title>
</head>
<body>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/correspondence/correspondenceView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/correspondence/correspondenceView.xhtml
index 7906159..6caf297 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/correspondence/correspondenceView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/correspondence/correspondenceView.xhtml
@@ -9,9 +9,6 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta>
- <link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
<title>Correspondence</title>
</head>
<body>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml
index dc245e1..572afa1 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/documentsearch/documentSearchView.xhtml
@@ -17,9 +17,6 @@
src="/plugins/views-common/views/doctree/documentVersionDialog.xhtml" />
<html>
<head>
-<link
- href="#{facesContext.externalContext.requestContextPath}/plugins/views-common/css/context-portal.css"
- rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></meta>
</head>
<body>