Drop _os suffix in EPSDK app database URL

Repair icon shown in Portal widgets "..."

Issue: PORTAL-49
Change-Id: I1bd83949d81609e56d8df84cd7d9e2c430237878
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

diff --git a/deliveries/configure-and-run.sh b/deliveries/configure-and-run.sh
index cb51576..5c2b2f4 100755 (executable)
--- a/deliveries/configure-and-run.sh
+++ b/deliveries/configure-and-run.sh
@@ -2,4 +2,4 @@
 
 LOGFILE=/opt/apache-tomcat-8.0.37/logs/catalina.out
 echo "`date`:<--------------------    Starting     -------------------->" >> $LOGFILE
-exec /opt/apache-tomcat-8.0.37/bin/catalina.sh run  2>&1 | tee -a $LOGFILE
\ No newline at end of file
+exec /opt/apache-tomcat-8.0.37/bin/catalina.sh run  2>&1 | tee -a $LOGFILE

diff --git a/deliveries/etc.zip b/deliveries/etc.zip
index dc530f5..54e496d 100644 (file)
Binary files a/deliveries/etc.zip and b/deliveries/etc.zip differ

diff --git a/ecomp-portal-BE-os/README.md b/ecomp-portal-BE-os/README.md
index 8962104..c114cea 100644 (file)
--- a/ecomp-portal-BE-os/README.md
+++ b/ecomp-portal-BE-os/README.md
@@ -14,20 +14,17 @@ https://www.eclipse.org/m2e-wtp/
 
 ## Release Notes
 
-Version 1.1.?, July 2017
+Version 1.1.0, July 2017
+- [Portal-6] Updates to License and Trademark in the PORTAL Source Code
+- [Portal-7] Improvements added as part of the rebasing process
+- [Portal-17] Remove jfree related items
 - [Portal-30] Failed to communicate with the widget microservice: Fixed
 - [Portal-35] Replaced the portal logo with onap logo on the login screen.
 - [Portal-40] Fix to add user roles 
-- [Portal-47] Fix to eliminate duplicate roles on Users page
 - [Portal-45] Fix to update an existing app on Application Onboarding
+- [Portal-47] Fix to eliminate duplicate roles on Users page
 - [Portal-48] Fix to save a new app on Application onboarding
-
-
-Version 1.1.0, July 2017
-- [Portal-7] Improvements added as part of the rebasing process
-- [Portal-6] Updates to License and Trademark in the PORTAL Source Code
-- [PORTAL-17] Remove jfree related items
-
+- [Portal-49] image icon is missing on Widget corner
 
 Version 1.0.0, February 2017
 - Initial release

diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less
index ac2a3cb..8d8f39f 100644 (file)
--- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less
+++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less
@@ -478,7 +478,10 @@ On click the images will be displayed at normal size to complete the effect
     -webkit-transition: background-color 0.3s ease-out;
     -moz-transition: background-color 0.3s ease-out;
     transition: background-color 0.3s ease-out;
+    span{
+               color: #888;   
     }
+ }
   
 .widgetHeaderBtnPosition {
        width: 30px;

diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html
index 9a87c0b..d71b8f7 100644 (file)
--- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html
@@ -128,11 +128,7 @@
                                                                                        ng-mousedown="showImpResOption=!showImpResOption"
                                                                                        ng-mouseleave="showImpResOption=false" title="Settings"
                                                                                        ddh-accessibility-click="13,32" tabindex="0"><span
-                                                                                       style="color: #888;"><img
-                                                                                       ng-src="assets/images/generic.png"
-                                                                                       style="margin-bottom: 3px; margin-left: 3px;" alt="..."
-                                                                                       aria-label="Tap or Click to move"
-                                                                                       src="assets/images/generic.png"></span></a>
+                                                                                       class="icon-controls-moreapplications"></span></a>
 
                                                                                <ul class="optionsMenu"
                                                                                        style="display: block"

diff --git a/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css b/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css
index 534712a..8e747af 100644 (file)
--- a/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css
+++ b/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css
@@ -1,7 +1,78 @@
 @charset "UTF-8";
 
 @font-face { font-family: "Ionicons"; src: url("../fonts/ionicons.eot?v=2.0.0"); src: url("../fonts/ionicons.eot?v=2.0.0#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=2.0.0") format("truetype"), url("../fonts/ionicons.woff?v=2.0.0") format("woff"), url("../fonts/ionicons.svg?v=2.0.0#Ionicons") format("svg"); font-weight: normal; font-style: normal; }
-.ionicons,.icon-controls-upPRIMARY, .icon-arrows-download:before, .icon-securityalerts-alertL:before, .icon-controls-add-maximize:before, .icon-controls-add-maximize-circle:before, .icon-misc-time:before, .icoSecurityalerts:before,.icon-apps-marketplace:before ,.icon-content-grid:before, .icon-documents-archive:before, .icon-arrows-vertical-arrow-down:before,.icoArrows-download:before, .icoArrows-incoming-call:before, .icon-arrows-outgoing-call:before, .icon-arrows-upload:before, .icon-arrows-straight-arrow:before,.icoArrows-vertical-arrow:before,  .icon-people-userbookmark:before, .icon-controls-check:before, .icon-chevron-down:before, .icon-controls-down:before, .icon-controls-left:before, .icon-controls-right:before, .icon-chevron-up:before, .icoDocuments-report:before, .icon-edit:before,.icon-misc-pen:before, .icon-controls-up:before, .icon-overview:before, .icon-settings:before,.icon-building-home:before,.icon-documents-book:before, .icoDocuments-book-outline:before, .icoDocuments-bookmarks:before, .icoDocuments-bookmarks-outline:before,.icon-add-widget:before , .icon-documents-copy:before,.icon-content-flag:before,.icon-primary-accordion-minus:before, .icon-misc-piechart:before,.icon-misc-piechart-outline:before,.icon-primary-accordion-plus:before,.icon-star:before,.icon-building-door:before,.icon-content-gridguide:before,.icon-user:before, .icon-people-oneperson:before, .icon-people-oneperson-add:before, .icon-people-oneperson-stalker:before,  .icon-controls-pointer:before, .icon-arrows-replay-restart:before, .icon-content-star:before, .icon-misc-trash:before, .icon-arrows-upload:before   { display: inline-block; font-family: "Ionicons"; speak: none; font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; text-rendering: auto; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; }
+.ionicons,
+.icon-controls-upPRIMARY, 
+.icon-arrows-download:before, 
+.icon-securityalerts-alertL:before, 
+.icon-controls-add-maximize:before, 
+.icon-controls-add-maximize-circle:before, 
+.icon-misc-time:before, 
+.icoSecurityalerts:before,
+.icon-apps-marketplace:before,
+.icon-content-grid:before,
+.icon-documents-archive:before,
+.icon-arrows-vertical-arrow-down:before,
+.icoArrows-download:before,
+.icoArrows-incoming-call:before,
+.icon-arrows-outgoing-call:before,
+.icon-arrows-upload:before,
+.icon-arrows-straight-arrow:before,
+.icoArrows-vertical-arrow:before,
+.icon-people-userbookmark:before,
+.icon-controls-check:before,
+.icon-chevron-down:before,
+.icon-controls-down:before,
+.icon-controls-left:before,
+.icon-controls-right:before,
+.icon-chevron-up:before,
+.icoDocuments-report:before,
+.icon-edit:before,
+.icon-controls-up:before,
+.icon-overview:before,
+.icon-settings:before,
+.icon-building-home:before,
+.icon-documents-book:before,
+.icoDocuments-book-outline:before,
+.icoDocuments-bookmarks:before,
+.icoDocuments-bookmarks-outline:before,
+.icon-add-widget:before,
+.icon-documents-copy:before,
+.icon-content-flag:before,
+.icon-primary-accordion-minus:before,
+.icon-misc-piechart:before,
+.icon-misc-piechart-outline:before,
+.icon-primary-accordion-plus:before,
+.icon-star:before,
+.icon-building-door:before,
+.icon-content-gridguide:before,
+.icon-user:before,
+.icon-people-oneperson:before, 
+.icon-people-oneperson-add:before, 
+.icon-people-oneperson-stalker:before,  
+.icon-controls-pointer:before, 
+.icon-arrows-replay-restart:before, 
+.icon-content-star:before, 
+.icon-misc-trash:before, 
+.icon-misc-pen:before,
+.ion-navicon:before, 
+.icon-primary-close:before, .close:before, .reset-field:before,
+.icon-datanetwork-softwareasaservice:before,
+.icon-datanetwork-messaging2:before,
+.icon-controls-moreapplications:before,
+.icon-arrows-upload:before { 
+       display: inline-block; 
+       font-family: "Ionicons"; 
+       speak: none; 
+       font-style: normal; 
+       font-weight: normal; 
+       font-variant: normal; 
+       text-transform: none; 
+       text-rendering: auto; 
+       line-height: 1; 
+       -webkit-font-smoothing: antialiased; 
+       -moz-osx-font-smoothing: grayscale; 
+       }
 
 
 
@@ -105,4 +176,18 @@
 
 .icon-controls-upPRIMARY:before { content: "\f3d8";  }
 
-.icon-misc-pen:before { content: "\f2bf"; }
\ No newline at end of file
+.icon-misc-pen:before { content: "\f2bf"; }
+
+.ion-navicon:before { content: "\f20e"; }
+
+.icon-building-home:before { content: "\f144"; }
+
+.icon-content-star:before { content: "\f24e"; }
+
+.icon-primary-close:before, .close:before, .reset-field:before { content: "\f129"; }
+
+.icon-datanetwork-softwareasaservice:before { content: "\f40c"; }
+
+.icon-datanetwork-messaging2:before { content: "\f132"; }
+
+.icon-controls-moreapplications:before { content: "\f20b"; }
\ No newline at end of file