Commit fb692400 authored by Dainius Simelevicius's avatar Dainius Simelevicius
Browse files

references #262: fixing links to hotspot and coldspot from spotlightocci

parent b2c23fd2
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
// !!! Edit this line to reflect the latest package version !!! // !!! Edit this line to reflect the latest package version !!!
#define WORKSUITE_SENTINELSPOTLIGHTOCCI_VERSION_MAJOR 4 #define WORKSUITE_SENTINELSPOTLIGHTOCCI_VERSION_MAJOR 4
#define WORKSUITE_SENTINELSPOTLIGHTOCCI_VERSION_MINOR 3 #define WORKSUITE_SENTINELSPOTLIGHTOCCI_VERSION_MINOR 4
#define WORKSUITE_SENTINELSPOTLIGHTOCCI_VERSION_PATCH 0 #define WORKSUITE_SENTINELSPOTLIGHTOCCI_VERSION_PATCH 0
// If any previous versions available E.g. #define WORKSUITE_SENTINELSPOTLIGHTOCCI_PREVIOUS_VERSIONS "3.8.0,3.8.1" // If any previous versions available E.g. #define WORKSUITE_SENTINELSPOTLIGHTOCCI_PREVIOUS_VERSIONS "3.8.0,3.8.1"
#define WORKSUITE_SENTINELSPOTLIGHTOCCI_PREVIOUS_VERSIONS "4.1.0,4.1.1,4.2.0" #define WORKSUITE_SENTINELSPOTLIGHTOCCI_PREVIOUS_VERSIONS "4.1.0,4.1.1,4.2.0,4.3.0"
// //
......
...@@ -1493,11 +1493,8 @@ void sentinel::spotlightocci::Application::HotspotTabPage (xgi::Output * out) ...@@ -1493,11 +1493,8 @@ void sentinel::spotlightocci::Application::HotspotTabPage (xgi::Output * out)
std::stringstream to; std::stringstream to;
to << this->getApplicationDescriptor()->getContextDescriptor()->getURL(); to << this->getApplicationDescriptor()->getContextDescriptor()->getURL();
//std::string url = toolbox::escape(to.str());
std::string url = cgicc::form_urlencode(to.str()); std::string url = cgicc::form_urlencode(to.str());
std::string model = cgicc::form_urlencode("https://xdaq.web.cern.ch/xdaq/setup/13/" + zone + "/defaultmodel.xml"); *out << "<a href=\"http://xubernetes.cms/" << zone << "/hotspot/" << "\" target=\"_blank\"><button><br/><img src=\"/sentinel/images/hotspot-icon.png\" style=\"height: 80px;\"><br />Hotspot<br/><br/></button></a>";
// *out << "<a href=\"https://xdaq.web.cern.ch/xdaq/xmas/13/hotspot/hotspot.swf?confPath=" << url << "&autoStart=true\" target=\"_blank\">Hotspot Flex Interface Test</a>"; *out << " <a href=\"http://xubernetes.cms/" << zone << "/coldspot/" << "\" target=\"_blank\"><button><br/><img src=\"/sentinel/images/coldspot-icon.png\" style=\"height: 80px;\"><br />Coldspot<br/><br/></button></a>";
*out << "<a href=\"https://xdaq.web.cern.ch/xdaq/xmas/13/hotspot/hotspot.swf?spotlighturl=" << url << "&sysmodelurl=" << model << "\" target=\"_blank\"><button><br/><img src=\"/sentinel/images/hotspot-icon.png\" style=\"height: 80px;\"><br />Hotspot Flex Interface<br/><br/></button></a>";
*out << " <a href=\"https://xdaq.web.cern.ch/xdaq/xmas/13/coldspot/coldspot.swf?spotlighturl=" << url << "&sysmodelurl=" << model << "\" target=\"_blank\"><button><br/><img src=\"/sentinel/images/coldspot-icon.png\" style=\"height: 80px;\"><br />Coldspot Flex Interface<br/><br/></button></a>";
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment