Changeset 195 for trunk/web


Ignore:
Timestamp:
09/20/05 16:06:59 (17 years ago)
Author:
bastiaans
Message:

TODO,AUTHORS:

  • First files for future open source release

ganglia_example.xml:

  • No longer needed

web/addons/toga/version.php:

  • Added a version.php for joblist

web/addons/toga/libtoga.php:

  • Included version.php

web/addons/toga/templates/footer.tpl:

  • Removed bogus/non-sence version stuff

web/addons/toga/templates/header.tpl:

  • Minor cosmetic layout fix

web/addons/toga/index.php:

  • Changed versioning variables

web/addons/toga/overview.php:

  • Fixed hostname/domain determination. Only add domain if not allready there.
Location:
trunk/web/addons/toga
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/web/addons/toga/index.php

    r189 r195  
    310310
    311311function makeFooter() {
    312         global $tpl, $version, $parsetime;
    313 
     312        global $tpl, $version, $parsetime, $monarchversion;
     313
     314        $tpl->gotoBlock( "_ROOT" );
    314315        $tpl->assign("webfrontend-version",$version["webfrontend"]);
    315         $tpl->assign("togaweb-version", "0.1");
    316         $tpl->assign("togaarch-version", "0.1");
    317         $tpl->assign("togaplug-version", "0.1");
     316        $tpl->assign("monarch-version", $monarchversion);
    318317
    319318        if ($version["gmetad"]) {
  • trunk/web/addons/toga/libtoga.php

    r177 r195  
    5252//
    5353include_once "./conf.php";
     54include_once "./version.php";
    5455
    5556global $GANGLIA_PATH;
  • trunk/web/addons/toga/overview.php

    r193 r195  
    625625                                               
    626626                        foreach ($hosts_up as $host ) {
    627                                 $host = $host. '.'.$domain;
     627
     628                                $domain_len = 0 - strlen( $domain );
     629                                if( substr( $host, $domain_len ) != $domain ) {
     630                                        $host = $host. '.'.$domain;
     631                                }
    628632                                $cpus = $metrics[$host]["cpu_num"][VAL];
    629633                                if (!$cpus) $cpus=1;
  • trunk/web/addons/toga/templates/footer.tpl

    r113 r195  
    22<CENTER>
    33<FONT SIZE="-1" class=footer>
    4 Toga Web Frontend version {togaweb-version}
    5 <A HREF="http://toga.sourceforge.net/">Check for Updates.</A><BR>
     4Job Monarch version {monarch-version}<BR>
    65
    7 Toga Archive Daemon <i>(tarchd)</i> version {togaarch-version}
    8 <A HREF="http://toga.sourceforge.net/">Check for Updates.</A><BR>
    9 
    10 Toga Plugin Daemon <i>(tplugd)</i> version {togaplug-version}
    11 <A HREF="http://toga.sourceforge.net/">Check for Updates.</A><BR>
    12 
    13 Gmetad Web Frontend version {webfrontend-version}
     6Ganglia version {webfrontend-version}
    147<A HREF="http://ganglia.sourceforge.net/downloads.php?component=ganglia-webfrontend&amp;
    158version={webfrontend-version}">Check for Updates.</A><BR>
    16 
    17 Gmetad Web Backend <i>({webbackend-component})</i> version {webbackend-version}
    18 <A HREF="http://ganglia.sourceforge.net/downloads.php?component={webbackend-component}&amp;
    19 version={webbackend-version}">Check for Updates.</A><BR>
    209
    2110Downloading and parsing ganglia's XML tree took {parsetime}.<BR>
  • trunk/web/addons/toga/templates/header.tpl

    r189 r195  
    5252    <INPUT TYPE="HIDDEN" NAME="period_stop" VALUE="{period_stop}">
    5353    <INPUT TYPE="HIDDEN" NAME="h" VALUE="{hostname}">
    54     <BR><BR><B>Graph timeperiod/ from
     54    <BR><BR><B>Graph/ from
    5555    <INPUT TYPE="text" NAME="period_start_pick" VALUE="{period_start}" ALT="Start time" DISABLED="TRUE">
    5656    <a href="javascript:show_calendar('document.{form_name}.period_start_pick', document.{form_name}.period_start_pick.value);" alt="Click to select a date/time" title="Click to select a date/time">
Note: See TracChangeset for help on using the changeset viewer.