SlatePermutate Changeset - d7b43b238441 · protofusion repositories

Changeset - d7b43b238441

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 4 0

Nathan Brink (binki) - 15 years ago 2010-12-03 00:57:45
ohnobinki@ohnopublishing.net

merge

4 files changed with 29 insertions and 6 deletions:

admin.php

inc/class.page.php

input.php

scripts/scheduleInput.js

0 comments (0 inline, 0 general)

admin.php

➞

Show inline comments

@@ @@ -145,17 +145,17 @@ @@
 <p>You are currently running version <?php echo SP_PACKAGE_VERSION; ?>. The latest available release is VERSION.</p>
 <h3>Rehash</h3>
-<p>Last full rehash ocurred on  <?php echo getLastRehash(); ?>.</p>
 <p>Last rehash ocurred on  <?php echo getLastRehash(); ?>.</p>
 <ul>
   <li><a href="admin.php?rehash">Rehash All Institutions</a></li>
-  <li><?php schoolsDropList(); ?> <a href="admin.php?rehash">Rehash Institution</a> </li>
+  <li><form action="admin.php">Rehash schedules for <?php schoolsDropList(); ?> <input type="submit" value="Go &raquo;" /> </form></li>
 </ul>
 <h3>Purge</h3>
-<p>The cache currently holds <?php echo getNumSaved(); ?> schedules.</p>
+<p>The cache currently contains <?php echo getNumSaved(); ?> schedules.</p>
 <ul>
   <li><a href="admin.php?purge">Purge Entire Cache</a></li>
   <li><form action="admin.php">Purge cache up to <input type="text" name="purgetodate" size="8" id="datepicker"/><input type="submit" value="Go&raquo;" /></form></li>
+  <li><form action="admin.php">Purge cache up to <input type="text" name="purgetodate" size="8" id="datepicker"/> <input type="submit" value="Go &raquo;" /></form></li>
 </ul>
 <?php

inc/class.page.php

➞

Show inline comments

@@ @@ -94,6 +94,7 @@ class page @@
     $this->headCode['jQuery'] = '<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js" type="text/javascript"></script>';
     $this->headCode['jQueryUI'] = '<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js" type="text/javascript"></script><link rel="stylesheet" href="styles/jqueryui.css" type="text/css" media="screen" charset="utf-8" />';
     $this->headCode['jValidate'] = '<script type="text/javascript" src="http://ajax.microsoft.com/ajax/jquery.validate/1.7/jquery.validate.pack.js"></script>';
     $this->headCode['qTip'] = '<script type="text/javascript" src="http://ohnopub.net/js/jquery.qtip-1.0.min.js"></script>';
     $this->headCode['schedInput'] = '<script type="text/javascript" src="scripts/scheduleInput.js"></script>';
     $this->headCode['outputPrintStyle'] = '<link rel="stylesheet" href="styles/print.css" type="text/css" media="screen" charset="utf-8" />';
     $this->headCode['outputStyle'] = '<link rel="stylesheet" href="styles/output.css" type="text/css" media="screen" charset="utf-8" />';

input.php

➞

Show inline comments

@@ @@ -24,9 +24,11 @@ include_once 'class.section.php'; @@
 include_once 'inc/class.page.php';
 require_once('inc/schedule_store.inc');
 $scripts = array('jQuery', 'jQueryUI', 'jValidate','schedInput');
+$scripts = array('jQuery', 'jQueryUI', 'jValidate','qTip','schedInput');
 $inputPage = new page('Scheduler', $scripts, FALSE);
 $schedule_store = FALSE;
 $sch = FALSE;
 $school = $inputPage->get_school();

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -211,6 +211,22 @@ function genOptionHtml(value, content, t @@
     return '<option value="' + value + '"' + selected + '>' + content + "</option>\n";
+}
 /** Add tooltips for user guidance */
 function addTips(id) {
   jQuery(id).qtip({
     content: 'Type your class ID (such as PEF-1010)',
     style: {
       name: 'dark',
       tip: true
     },
 /*    show: { ready: false }, */
 /*    hide: { when: { event: 'inactive' } }, */
     corner: { target: 'topMiddle', tooltip: 'bottomMiddle' },
   });
+}
 /**
  * \brief
  *   Add a section to a class.
@@ @@ -277,7 +293,7 @@ function add_sections(cnum, data) @@
+				    }
 			    });
+		addTips('.class'+classNum+ ' td:first');
 		classNum++;
 		return (classNum - 1);
@@ @@ -394,4 +410,8 @@ jQuery(document).ready(function() { @@
 		jQuery('#showadvanced').hide();
 		jQuery('.advanced').slideToggle();
 	});
 });

0 comments (0 inline, 0 general)