summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-03-19 04:55:46 (EDT)
committer Manik Kishore2012-06-19 07:22:01 (EDT)
commit302c94bf42aa85bc265a3aed3221721226b6eb78 (patch)
treee5dcad05a1b9ec1ad9133df940223d6e28bd8be8
parent57565d736ed8d6abaa7955a02e4b0644f6788be9 (diff)
downloadorg.eclipse.stardust.ui.web-302c94bf42aa85bc265a3aed3221721226b6eb78.zip
org.eclipse.stardust.ui.web-302c94bf42aa85bc265a3aed3221721226b6eb78.tar.gz
org.eclipse.stardust.ui.web-302c94bf42aa85bc265a3aed3221721226b6eb78.tar.bz2
Jira-ID: CRNT-24135
1)Moved Tiff annotations related icons from views-common/images/icons to views-common/images/annotations 2)Deleted graphics-common/image folder git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54632 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyCanvasController.js14
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/css/context-portal.css2
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/black.jpeg (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/black.jpeg)bin3267 -> 3267 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/gray.jpg (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/gray.jpg)bin1558 -> 1558 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Blue.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Blue.png)bin1069 -> 1069 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Green.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Green.png)bin1019 -> 1019 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Red.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Red.png)bin861 -> 861 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Yellow.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Yellow.png)bin867 -> 867 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/menuBG.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/menuBG.png)bin1146 -> 1146 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Blu_200_150.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Blu_200_150.png)bin2861 -> 2861 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Grn_200_150.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Grn_200_150.png)bin2827 -> 2827 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Pnk_200_150.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Pnk_200_150.png)bin2951 -> 2951 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Yel_200_150.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Yel_200_150.png)bin4259 -> 4259 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/icons/noStampSelected.PNGbin851 -> 0 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/images/notes-background.png (renamed from views-common/src/main/resources/META-INF/xhtml/images/icons/notes-background.png)bin168 -> 168 bytes
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/views/document/imageViewerConfiguration.xhtml24
-rw-r--r--views-common/src/main/resources/META-INF/xhtml/views/document/tiffViewer.xhtml6
17 files changed, 23 insertions, 23 deletions
diff --git a/graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyCanvasController.js b/graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyCanvasController.js
index f2dd575..ffa7072 100644
--- a/graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyCanvasController.js
+++ b/graphics-common/src/main/resources/META-INF/xhtml/js/m_pharmacyCanvasController.js
@@ -29,7 +29,7 @@ define([ "m_pharmacyToolbarController", "m_canvasManager", "m_communicationContr
var annotationHighlighter = undefined;
var _toolActionsMap;
var _annotationMovedFlag = false;
- var bgImage = "../../images/icons/gray.jpg";
+ var bgImage = "../../images/annotations/gray.jpg";
var imageViewerConfigOptions;
var sharedViewerState = {};
var annotationWithContextMenu;
@@ -1794,16 +1794,16 @@ define([ "m_pharmacyToolbarController", "m_canvasManager", "m_communicationContr
function getBGImageForColour(colour)
{
var colourMap = {
- green : "../../images/icons/postItBG-Grn_200_150.png",
- pink : "../../images/icons/postItBG-Pnk_200_150.png",
- blue : "../../images/icons/postItBG-Blu_200_150.png",
- yellow : "../../images/icons/postItBG-Yel_200_150.png"
+ green : "../../images/annotations/postItBG-Grn_200_150.png",
+ pink : "../../images/annotations/postItBG-Pnk_200_150.png",
+ blue : "../../images/annotations/postItBG-Blu_200_150.png",
+ yellow : "../../images/annotations/postItBG-Yel_200_150.png"
}
var url = colourMap[colour];
if (url == undefined)
{
- url = "../../images/icons/postItBG-Yel_200_150.png";
+ url = "../../images/annotations/postItBG-Yel_200_150.png";
}
return url;
@@ -2218,7 +2218,7 @@ define([ "m_pharmacyToolbarController", "m_canvasManager", "m_communicationContr
{
var menuOptions = getAnnotContextMenuOptions(annotation);
var annotContextMenu = [];
- var blackBack = m_canvasManager.drawImageAt("../../images/icons/black.jpeg", menuOptions.x, menuOptions.y, menuOptions.backWidth, menuOptions.backHeight);
+ var blackBack = m_canvasManager.drawImageAt("../../images/annotations/black.jpeg", menuOptions.x, menuOptions.y, menuOptions.backWidth, menuOptions.backHeight);
annotContextMenu.push(blackBack);
//Add delete menu
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
index e2da682..907ecc3 100644
--- 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
@@ -302,7 +302,7 @@ chat-protocol-table
.notesTooltip .icePnlTlTip{
width:200px;
border:1px solid #FFCC00;
- background: url('../images/icons/notes-background.png') top repeat-x #FFFFE0;
+ background: url('../images/notes-background.png') top repeat-x #FFFFE0;
clear:both;
font-family:Arial, Helvetica, sans-serif;
font-size:11px;
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/black.jpeg b/views-common/src/main/resources/META-INF/xhtml/images/annotations/black.jpeg
index a4184de..a4184de 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/black.jpeg
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/black.jpeg
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/gray.jpg b/views-common/src/main/resources/META-INF/xhtml/images/annotations/gray.jpg
index f103bce..f103bce 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/gray.jpg
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/gray.jpg
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Blue.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Blue.png
index f8cf31b..f8cf31b 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Blue.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Blue.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Green.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Green.png
index fb9cfd6..fb9cfd6 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Green.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Green.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Red.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Red.png
index 7b6c4e3..7b6c4e3 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Red.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Red.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Yellow.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Yellow.png
index cabf994..cabf994 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/highlightBG-Yellow.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/highlightBG-Yellow.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/menuBG.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/menuBG.png
index 0a59716..0a59716 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/menuBG.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/menuBG.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Blu_200_150.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Blu_200_150.png
index ccf29dc..ccf29dc 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Blu_200_150.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Blu_200_150.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Grn_200_150.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Grn_200_150.png
index 47b1da0..47b1da0 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Grn_200_150.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Grn_200_150.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Pnk_200_150.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Pnk_200_150.png
index 47b7534..47b7534 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Pnk_200_150.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Pnk_200_150.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Yel_200_150.png b/views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Yel_200_150.png
index 86c160c..86c160c 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/postItBG-Yel_200_150.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/annotations/postItBG-Yel_200_150.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/noStampSelected.PNG b/views-common/src/main/resources/META-INF/xhtml/images/icons/noStampSelected.PNG
deleted file mode 100644
index 2270a1a..0000000
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/noStampSelected.PNG
+++ /dev/null
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/images/icons/notes-background.png b/views-common/src/main/resources/META-INF/xhtml/images/notes-background.png
index 68d5806..68d5806 100644
--- a/views-common/src/main/resources/META-INF/xhtml/images/icons/notes-background.png
+++ b/views-common/src/main/resources/META-INF/xhtml/images/notes-background.png
Binary files differ
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/document/imageViewerConfiguration.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/document/imageViewerConfiguration.xhtml
index c0cf225..32be616 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/document/imageViewerConfiguration.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/document/imageViewerConfiguration.xhtml
@@ -108,25 +108,25 @@
<ice:commandLink actionListener="#{imageViewerConfigurationBean.changeStickyNoteColour}" style="vertical-align: bottom;">
<f:param name="colour" value="green" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/postItBG-Grn_200_150.png"
+ value="/plugins/views-common/images/annotations/postItBG-Grn_200_150.png"
height="16px" width="16px" style="border: 2px solid gray; #{(imageViewerConfigurationBean.stickyNoteColour == 'green') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
<ice:commandLink actionListener="#{imageViewerConfigurationBean.changeStickyNoteColour}" style="vertical-align: bottom;">
<f:param name="colour" value="pink" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/postItBG-Pnk_200_150.png"
+ value="/plugins/views-common/images/annotations/postItBG-Pnk_200_150.png"
height="16px" width="16px" style="border: 2px solid gray; #{(imageViewerConfigurationBean.stickyNoteColour == 'pink') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
<ice:commandLink actionListener="#{imageViewerConfigurationBean.changeStickyNoteColour}" style="vertical-align: bottom;">
<f:param name="colour" value="blue" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/postItBG-Blu_200_150.png"
+ value="/plugins/views-common/images/annotations/postItBG-Blu_200_150.png"
height="16px" width="16px" style="border: 2px solid gray; #{(imageViewerConfigurationBean.stickyNoteColour == 'blue') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
<ice:commandLink actionListener="#{imageViewerConfigurationBean.changeStickyNoteColour}" style="vertical-align: bottom;">
<f:param name="colour" value="yellow" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/postItBG-Yel_200_150.png"
+ value="/plugins/views-common/images/annotations/postItBG-Yel_200_150.png"
height="16px" width="16px" style="border: 2px solid gray; #{(imageViewerConfigurationBean.stickyNoteColour == 'yellow') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
<ice:graphicImage
@@ -164,25 +164,25 @@
<ice:commandLink actionListener="#{imageViewerConfigurationBean.changeHighlighterColour}" style="vertical-align: bottom;">
<f:param name="colour" value="#00FF00" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/highlightBG-Green.png"
+ value="/plugins/views-common/images/annotations/highlightBG-Green.png"
height="16px" width="16px" style="border: 2px solid gray; #{(imageViewerConfigurationBean.highlighterColour == '#00FF00') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
<ice:commandLink actionListener="#{imageViewerConfigurationBean.changeHighlighterColour}" style="vertical-align: bottom;">
<f:param name="colour" value="#FF0000" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/highlightBG-Red.png"
+ value="/plugins/views-common/images/annotations/highlightBG-Red.png"
height="16px" width="16px" style="border: 2px solid gray; #{(imageViewerConfigurationBean.highlighterColour == '#FF0000') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
<ice:commandLink actionListener="#{imageViewerConfigurationBean.changeHighlighterColour}" style="vertical-align: bottom;">
<f:param name="colour" value="#00FFFF" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/highlightBG-Blue.png"
+ value="/plugins/views-common/images/annotations/highlightBG-Blue.png"
height="16px" width="16px" style="border: 2px solid gray; #{(imageViewerConfigurationBean.highlighterColour == '#00FFFF') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
<ice:commandLink actionListener="#{imageViewerConfigurationBean.changeHighlighterColour}" style="vertical-align: bottom;">
<f:param name="colour" value="#FFFF00" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/highlightBG-Yellow.png"
+ value="/plugins/views-common/images/annotations/highlightBG-Yellow.png"
height="16px" width="16px" style="border: 2px solid gray; #{(imageViewerConfigurationBean.highlighterColour == '#FFFF00') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
</ice:panelGroup>
@@ -287,7 +287,7 @@
actionListener="#{imageViewerConfigurationBean.changeDataFieldHighlightColour}">
<f:param name="colour" value="#00FF00" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/highlightBG-Green.png"
+ value="/plugins/views-common/images/annotations/highlightBG-Green.png"
height="16px" width="16px"
style="border: 2px solid gray; #{(imageViewerConfigurationBean.dataFieldHighlightColour == '#00FF00') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
@@ -295,7 +295,7 @@
actionListener="#{imageViewerConfigurationBean.changeDataFieldHighlightColour}">
<f:param name="colour" value="#FF0000" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/highlightBG-Red.png"
+ value="/plugins/views-common/images/annotations/highlightBG-Red.png"
height="16px" width="16px"
style="border: 2px solid gray; #{(imageViewerConfigurationBean.dataFieldHighlightColour == '#FF0000') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
@@ -303,7 +303,7 @@
actionListener="#{imageViewerConfigurationBean.changeDataFieldHighlightColour}">
<f:param name="colour" value="#00FFFF" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/highlightBG-Blue.png"
+ value="/plugins/views-common/images/annotations/highlightBG-Blue.png"
height="16px" width="16px"
style="border: 2px solid gray; #{(imageViewerConfigurationBean.dataFieldHighlightColour == '#00FFFF') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
@@ -311,7 +311,7 @@
actionListener="#{imageViewerConfigurationBean.changeDataFieldHighlightColour}">
<f:param name="colour" value="#FFFF00" />
<ice:graphicImage
- value="/plugins/views-common/images/icons/highlightBG-Yellow.png"
+ value="/plugins/views-common/images/annotations/highlightBG-Yellow.png"
height="16px" width="16px"
style="border: 2px solid gray; #{(imageViewerConfigurationBean.dataFieldHighlightColour == '#FFFF00') ? 'opacity: 1; filter:alpha(opacity=100);' : 'opacity: 0.3; filter:alpha(opacity=30)'}" />
</ice:commandLink>
diff --git a/views-common/src/main/resources/META-INF/xhtml/views/document/tiffViewer.xhtml b/views-common/src/main/resources/META-INF/xhtml/views/document/tiffViewer.xhtml
index bbbb074..0103e24 100644
--- a/views-common/src/main/resources/META-INF/xhtml/views/document/tiffViewer.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/views/document/tiffViewer.xhtml
@@ -170,7 +170,7 @@
</div>
<div id="editable" style="visibility : hidden;"></div>
<div id="stampGallery"></div>
- <div id="highlighterColourPalette" width="150px" height="50px" style="visibility : hidden; background: url(../../images/icons/menuBG.png);">
+ <div id="highlighterColourPalette" width="150px" height="50px" style="visibility : hidden; background: url(../../images/annotations/menuBG.png);">
<table width="150px" height="50px">
<tr>
<td align="right"width='20' height='20'>
@@ -202,7 +202,7 @@
</tr>
</table>
</div>
- <div id="stickyNoteColourPalette" width="170px" height="70px" style="visibility : hidden; background: url(../../images/icons/menuBG.png);">
+ <div id="stickyNoteColourPalette" width="170px" height="70px" style="visibility : hidden; background: url(../../images/annotations/menuBG.png);">
<table>
<tr>
<td align="right" width='20' height='20'>
@@ -276,7 +276,7 @@
</tr>
</table>
</div>
- <div id="annotationInfoPanel" width="170px" height="70px" style="visibility : hidden; background: url(../../images/icons/menuBG.png);">
+ <div id="annotationInfoPanel" width="170px" height="70px" style="visibility : hidden; background: url(../../images/annotations/menuBG.png);">
<table width="170px" height="70px">
<tr>
<td align="right" width='20' height='20'>