arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved copy of web.pm and webportal.pm into %install. Fixed service portal.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10642 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2011-09-26 20:38:29 +00:00
parent f5b9ffacf0
commit a12e75f095
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-UI/css/style.css
View File

@ -83,6 +83,7 @@
color: #0000FF;
text-decoration: none;
cursor: pointer;
font-weight: normal;
}
#header div a:hover {

8
xCAT-UI/js/service/service.js
View File

@ -41,7 +41,7 @@ function initServicePage() {
}
// Load jQuery stylesheets
includeCss("css/query.dataTables.css");
includeCss("css/jquery.dataTables.css");
includeCss("css/superfish.css");
includeCss("css/jstree.css");
includeCss("css/jquery.jqplot.css");
@ -57,9 +57,13 @@ function initServicePage() {
includeJs("js/jquery/jquery.jqplot.min.js");
includeJs("js/jquery/jqplot.dateAxisRenderer.min.js");
// Enable settings link
$('#xcat_settings').click(function() {
openSettings();
});
// Show service page
$("#content").children().remove();
includeJs("js/service/service.js");
includeJs("js/service/utils.js");
loadServicePage();
}

4
xCAT-UI/js/ui.js
View File

@ -483,7 +483,7 @@ function initPage() {
}
// Load jQuery stylesheets
includeCss("css/query.dataTables.css");
includeCss("css/jquery.dataTables.css");
includeCss("css/superfish.css");
includeCss("css/jstree.css");
includeCss("css/jquery.jqplot.css");
@ -755,7 +755,7 @@ function openSettings() {
"Ok": function(){
// Save selected theme
var theme = $(this).find('input[name="theme"]:checked').val();
$.cookie('xcat_theme', theme, { expires: 30 });
$.cookie('xcat_theme', theme); // Do not expire cookie, keep it as long as possible
// Show instructions to apply theme
$(this).empty();

2
xCAT-UI/service.php
View File

@ -34,7 +34,7 @@ echo
if (isset($_SESSION['srv_username'])){
echo
"<div>
<span style='padding: 0 6px; color: white; font-weight: bold;'>{$_SESSION['srv_username']}</span> | <a id='xcat_settings'>Settings</a> | <a href='lib/logout.php'>Log out</a>
<span style='padding: 0 6px; color: white; font-weight: bold;'>{$_SESSION['srv_username']}</span> | <a id='xcat_settings'>Settings</a> | <a href='lib/srv_logout.php'>Log out</a>
</div>";
}

18
xCAT-UI/xCAT-UI.spec
View File

@ -80,6 +80,16 @@ cp -r * $RPM_BUILD_ROOT%{prefix}/ui
chmod 755 $RPM_BUILD_ROOT%{prefix}/ui/*
set -x
%ifos linux
# Copy xCAT plugins to /opt/xcat/lib/perl/xCAT_plugin
cp %{prefix}/ui/xcat/plugins/web.pm /opt/xcat/lib/perl/xCAT_plugin/
cp %{prefix}/ui/xcat/plugins/webportal.pm /opt/xcat/lib/perl/xCAT_plugin/
/bin/ln -s /opt/xcat/bin/xcatclientnnr /opt/xcat/bin/webportal
/etc/init.d/xcatd restart
%else # AIX
# TBD
%endif
%files
%defattr(-,root,root)
%{prefix}/ui
@ -138,13 +148,7 @@ set -x
fi
if [ "$1" = 1 ] || [ "$1" = 2 ] # Install or upgrade
then
# Copy xCAT plugins to /opt/xcat/lib/perl/xCAT_plugin
cp %{prefix}/ui/xcat/plugins/web.pm /opt/xcat/lib/perl/xCAT_plugin/
cp %{prefix}/ui/xcat/plugins/webportal.pm /opt/xcat/lib/perl/xCAT_plugin/
/bin/ln -s /opt/xcat/bin/xcatclientnnr /opt/xcat/bin/webportal
/etc/init.d/xcatd restart
then
# Copy php.ini file into /opt/xcat/ui and turn off output_buffering
if [ -e "/etc/redhat-release" ]; then
/bin/sed /etc/php.ini -e 's/output_buffering = 4096/output_buffering = Off/g' > %{prefix}/ui/php.ini