commit just prior to some pure insanity.

implementing theme system



git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@463 c5b2fb0a-d05d-0410-98c8-828840a80ff6

4 files changed, 40 insertions, 18 deletions

diff --git a/modules/admin/admin_functions.php b/modules/admin/admin_functions.php
index 30a40d0..6c2b394 100644
--- a/modules/admin/admin_functions.php
+++ b/modules/admin/admin_functions.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */ 

- 

+ /*

 if(!defined("ADMIN_FILE"))

 {

   die("Access denied.");

@@ -86,7 +86,7 @@ function logout()
   session_unset();

   session_destroy();

 }

-

+*/

 /**

  * CompileAdmin()

  *

@@ -99,9 +99,10 @@ function logout()
  * @param mixed $body

  * @return

  */

+ /*

 function CompileAdmin($head,$body)

 {

-  /*if we were not passed arrays, then say goodbye*/

+  /*if we were not passed arrays, then say goodbye

   if(!is_array($head) || !is_array($body))

   {

     echo "must be array\n";

@@ -123,7 +124,7 @@ function CompileAdmin($head,$body)
   echo "</tr></table>\n";

 }

 

-/**

+

  * OpenTable()

  *

  *  The administration OpenTable() function requires an argument to define

@@ -132,20 +133,20 @@ function CompileAdmin($head,$body)
  * 

  * @param mixed $title

  * @return

- */

+ 

 function OpenTable_Ex($title)

 {

   echo "<table align=\"center\"><tr><th>{$title}</th></tr><tr><td>";

 }

 

-/**

+

  * CloseTable()

  * 

  * @return

- */

+

 function CloseTable_Ex()

 {

   echo "</td></tr></table>";

 }

-

+ */

 ?> 
\ No newline at end of file
diff --git a/modules/admin/index.php b/modules/admin/index.php
index 4dd4539..fc379ea 100644
--- a/modules/admin/index.php
+++ b/modules/admin/index.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */ 

- 

+ /*

   if(!defined("MODULE_FILE"))

   {

     die("Access denied.");

@@ -30,12 +30,12 @@
     logout();

   }

   

-/*  if(login())

+ if(login())

   {

     //this is so dirty...  sigh.

     if(is_loggedin())

     {

-     */ ?>          

+      ?>          

       <!-- Add id="wrapper" for full height -->

       <table align="center" width="90%" >

       <tr><td><div style="text-align:right"><a href="?load=admin&op=logout">Logout, <?php echo $_SESSION['username']?></a></div></td></tr>

@@ -66,7 +66,7 @@
             

       </table>

   </div>

-      <?php /*)

+      <?php )

     }

   } */

     

diff --git a/modules/admin/operation.php b/modules/admin/operation.php
index 0ac2a9b..2c66ff4 100644
--- a/modules/admin/operation.php
+++ b/modules/admin/operation.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */ 

- 

+ /*

 if(!defined("ADMIN_FILE"))

 {

   die("Access denied.");

@@ -49,5 +49,5 @@ else
 }

 

 

-

+*/

 ?> 
\ No newline at end of file
diff --git a/modules/rudi/views/view.drills.php b/modules/rudi/views/view.drills.php
index 5fcd18e..aa4b30a 100644
--- a/modules/rudi/views/view.drills.php
+++ b/modules/rudi/views/view.drills.php
@@ -25,9 +25,14 @@ function Rating($val)
     return "Bad Value";   
 }
 
+//$this->getMemberAttendance();
+
+OpenContent();
 ?>
-<?php if(isset($_GET['id'])): ?>
+<div class="contentHeading">Drills</div>
+<div class="content">
 
+<?php if(isset($_GET['id'])): ?>
 <table cellspacing="20" class="rudi" align="left" style="width: 100%;">
 <tr>
   <th class="header">News</th>
@@ -53,7 +58,7 @@ function Rating($val)
 	<th class="header">Soldier</th>
 	<th class="header">Performance Rating</th>
 	<th class="header">Initiative Rating</th>
-	<th class="header">Early Excusal</th>
+	<th class="header">Excusal</th>
 	<th class="header">Excusal Reason</th>
 </tr>
 <?php foreach($drills->manifest->members as $member): ?>
@@ -67,7 +72,7 @@ function Rating($val)
 	<td class="rudi"><?php echo $pRating; ?>&nbsp;</td>
 	<td class="rudi"><?php echo $iRating; ?>&nbsp;</td>
 	<td class="rudi"><?php echo ($member->excusal ? "Yes" : "No"); ?>&nbsp;</td>
-  	<td class="rudi"><?php echo $member->excusal_reason; ?>&nbsp;</td>
+  	<td class="rudi"><?php echo $this->evalData($member->excusal_reason); ?>&nbsp;</td>
 </tr>
 <?php endforeach; ?>  
 </table>
@@ -93,9 +98,25 @@ function Rating($val)
 <?php endforeach; ?>
 </table>
 
-
+</div>
 <?php 
+CloseContent();
+OpenContent();
+?>
+<?php if(isset($_GET['stats']) && $_GET['stats'] == 'true'): ?>
+<div class="contentHeading">Statistics</div>
+<div class="content">
+<?php
+//decho($drills->getMemberAttendanceFull());
+require_once 'view.drills.statistics.php';
+?>
+</div>
+</div>
 
+<?php endif; ?>
+
+<?php
+CloseContent();
 decho('DATA FOR NO ID QUERY');
 decho($drills->manifest);
 ?>