Add static server option

Squashed commit of the following: commit b196975 Author: drlippman <[email protected]> Date: Sun Sep 20 21:19:33 2020 -0700 Adjust addquestions2 arrow commit efb0c43 Author: drlippman <[email protected]> Date: Sun Sep 20 21:14:36 2020 -0700 Setup static for addquestions2 commit 4344e80 Merge: 47385ba a8e9bbc Author: drlippman <[email protected]> Date: Sun Sep 20 21:09:51 2020 -0700 Merge branch 'master' into feature.static_server commit 47385ba Author: drlippman <[email protected]> Date: Fri Sep 18 17:00:40 2020 -0700 More staticroot commit 7b94f5d Author: drlippman <[email protected]> Date: Thu Sep 17 13:09:28 2020 -0700 switch js,css,imgs to staticroot commit 3cf9b88 Author: drlippman <[email protected]> Date: Thu Sep 17 00:16:20 2020 -0700 Adjust MQ fonts to allow all CORS commit d5be7bd Author: drlippman <[email protected]> Date: Wed Sep 16 16:21:30 2020 -0700 Start on getting static resource server to work
drlippman · Sep 21, 2020 · 8eb72ac · 8eb72ac
1 parent a8e9bbc
commit 8eb72ac
Show file tree

Hide file tree

Showing 144 changed files with 798 additions and 784 deletions.
diff --git a/DEembedq.php b/DEembedq.php
@@ -227,7 +227,7 @@ function sandboxgetweights($code,$seed) {
 }
 
 function printscore($sc,$qsetid,$seed) {
-	global $DBH,$imasroot;
+	global $DBH,$imasroot,$staticroot;
 	$poss = 1;
 	if (strpos($sc,'~')===false) {
 		$sc = str_replace('-1','N/A',$sc);
@@ -261,7 +261,7 @@ function printscore($sc,$qsetid,$seed) {
 			} else {
 				$pm = 'ychk'; $alt=_('Partially correct');
 			}
-			$bar = "<img src=\"$imasroot/img/$pm.gif\" alt=\"$alt\"/>";
+			$bar = "<img src=\"$staticroot/img/$pm.gif\" alt=\"$alt\"/>";
 			$scarr[$k] = "$bar $v/{$ptposs[$k]}";
 		}
 		$sc = implode(', ',$scarr);

diff --git a/OEAembedq.php b/OEAembedq.php
@@ -365,7 +365,7 @@ function sandboxgetweights($code,$seed) {
 }
 
 function printscore($sc,$qsetid,$seed) {
-	global $DBH,$imasroot;
+	global $DBH,$imasroot,$staticroot;
 	$poss = 1;
 	if (strpos($sc,'~')===false) {
 		$sc = str_replace('-1','N/A',$sc);
@@ -399,7 +399,7 @@ function printscore($sc,$qsetid,$seed) {
 			} else {
 				$pm = 'ychk'; $alt=_('Partially correct');
 			}
-			$bar = "<img src=\"$imasroot/img/$pm.gif\" alt=\"$alt\"/>";
+			$bar = "<img src=\"$staticroot/img/$pm.gif\" alt=\"$alt\"/>";
 			$scarr[$k] = "$bar $v/{$ptposs[$k]}";
 		}
 		$sc = implode(', ',$scarr);

diff --git a/admin/addcourse.php b/admin/addcourse.php
@@ -11,9 +11,9 @@
 }
 
 
-$placeinhead = '<script src="../javascript/copyitemslist.js" type="text/javascript"></script>';
-$placeinhead .= '<link rel="stylesheet" href="../course/libtree.css" type="text/css" />';
-$placeinhead .= '<script type="text/javascript" src="../javascript/libtree.js"></script>';
+$placeinhead = '<script src="'.$staticroot.'/javascript/copyitemslist.js" type="text/javascript"></script>';
+$placeinhead .= '<link rel="stylesheet" href="'.$staticroot.'/course/libtree.css" type="text/css" />';
+$placeinhead .= '<script type="text/javascript" src="'.$staticroot.'/javascript/libtree.js"></script>';
 require("../header.php");
 
 echo '<div class=breadcrumb>'.$breadcrumbbase.' '._('Add New Course').'</div>';
@@ -70,4 +70,4 @@
 echo '</div>';
 writeEkeyField();
 echo '<button type=submit id=continuebutton disabled style="display:none">'._('Continue').'</button>';
-echo '</form>';
+echo '</form>';
diff --git a/admin/addremoveteachers.php b/admin/addremoveteachers.php
@@ -164,7 +164,7 @@ function getTeachers($cid) {
 <div id="currentteachers">
 	<h2>Current Teachers</h2>
 	<p>With selected: <button @click="removeTeachers()">Remove as teacher</button>
-	   <span v-if="processingRemove" class="noticetext">Saving Changes... <img src="../img/updating.gif"></span>
+	   <span v-if="processingRemove" class="noticetext">Saving Changes... <img src="<?php echo $staticroot;?>/img/updating.gif"></span>
 	</p>
 	<transition-group name="fade" tag="ul" class="nomark">
 		<li v-for="teacher in existingTeachers" :key="teacher.id">
@@ -177,8 +177,8 @@ function getTeachers($cid) {
 	<p><button @click="loadGroup()">List my group members</button>
 		or lookup a teacher: <input v-model="toLookup" size=30>
 		<button @click="searchTeacher()" :disabled="toLookup.length==0">Search</button>
-		<span v-if="processingSearch" class="noticetext">Looking up teachers... <img src="../img/updating.gif"></span>
-		<span v-if="processingAdd" class="noticetext">Adding teachers... <img src="../img/updating.gif"></span>
+		<span v-if="processingSearch" class="noticetext">Looking up teachers... <img src="<?php echo $staticroot;?>/img/updating.gif"></span>
+		<span v-if="processingAdd" class="noticetext">Adding teachers... <img src="<?php echo $staticroot;?>/img/updating.gif"></span>
 	</p>
 	<p v-if="searchResults !== null && searchResults.length==0">No teachers found</p>
 	<p v-if="searchResults !== null && searchResults.length>0">

diff --git a/admin/admin.php b/admin/admin.php
@@ -192,7 +192,7 @@
 
 }
 
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/tablesorter.js\"></script>\n";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/tablesorter.js\"></script>\n";
 $placeinhead .= "<script>\nfunction showcourses() { \n";
 $placeinhead .= "  var uid=document.getElementById(\"seluid\").value; \n";
 $placeinhead .= "  if (uid>0) {window.location='admin.php?showcourses='+uid;} \n";

diff --git a/admin/admin2.php b/admin/admin2.php
@@ -147,7 +147,7 @@ function getRoleNameByRights($rights) {
 }
 
 /******* begin html output ********/
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/tablesorter.js\"></script>\n";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/tablesorter.js\"></script>\n";
 require("../header.php");
 
 if ($overwriteBody==1) {

diff --git a/admin/ccexport.php b/admin/ccexport.php
@@ -154,7 +154,7 @@ function chkgrp(frm, arr, mark) {
 		$tdpad = 5*strlen($prespace[$i]);
 
 
-		echo '<td style="padding-left:'.$tdpad.'px"><img alt="'.$types[$i].'" title="'.$types[$i].'" src="'.$imasroot.'/img/';
+		echo '<td style="padding-left:'.$tdpad.'px"><img alt="'.$types[$i].'" title="'.$types[$i].'" src="'.$staticroot.'/img/';
 		switch ($types[$i]) {
 			case 'Calendar': echo $CFG['CPS']['miniicons']['calendar']; break;
 			case 'InlineText': echo $CFG['CPS']['miniicons']['inline']; break;

diff --git a/admin/diagsetup.php b/admin/diagsetup.php
@@ -292,7 +292,7 @@ function decodeSelector($sel) {
 
 }
 
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/diag.js\"></script>\n";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/diag.js\"></script>\n";
 
  /******* begin html output ********/
 require("../header.php");

diff --git a/admin/forms.php b/admin/forms.php
@@ -8,8 +8,8 @@
 	require($CFG['hooks']['admin/forms']);
 }
 
-$placeinhead = '<script type="text/javascript" src="'.$imasroot.'/javascript/jquery.validate.min.js?v=122917"></script>';
-$placeinhead .= "<script type=\"text/javascript\" src=\"$imasroot/javascript/DatePicker.js\"></script>";
+$placeinhead = '<script type="text/javascript" src="'.$staticroot.'/javascript/jquery.validate.min.js?v=122917"></script>';
+$placeinhead .= "<script type=\"text/javascript\" src=\"$staticroot/javascript/DatePicker.js\"></script>";
 
 //call hook, if defined
 if (function_exists('getHeaderCode')) {
@@ -259,7 +259,7 @@ function searchgrps() {
 			echo '<span id="newpwwrap" style="display:none">Set temporary password to: <input type=text size=20 name="newpassword" /></span></span><br class=form />';
 		}
 
-		echo "<BR><span class=form><img src=\"$imasroot/img/help.gif\" alt=\"Help\" onClick=\"window.open('$imasroot/help.php?section=rights','help','top=0,width=400,height=500,scrollbars=1,left='+(screen.width-420))\"/> Set User rights to: </span> \n";
+		echo "<BR><span class=form><img src=\"$staticroot/img/help.gif\" alt=\"Help\" onClick=\"window.open('$imasroot/help.php?section=rights','help','top=0,width=400,height=500,scrollbars=1,left='+(screen.width-420))\"/> Set User rights to: </span> \n";
 		echo "<span class=formright><input type=radio name=\"newrights\" value=\"5\" ";
 		if ($oldrights == 5) {echo "CHECKED";}
 		echo "> Guest User <BR>\n";
@@ -439,7 +439,7 @@ function searchgrps() {
 			if (isset($enablebasiclti) && $enablebasiclti==true) {
 				//Start grouping: LMS Integration
 				echo '<div class="block grouptoggle">';
-				echo '<img class="mida" src="../img/expand.gif" /> ';
+				echo '<img class="mida" src="'.$staticroot.'/img/expand.gif" /> ';
 				echo 'LMS Integration (LTI)';
 				echo '</div>';
 				echo '<div class="blockitems hidden">';
@@ -770,7 +770,7 @@ function courselevelchg(el) {
 				echo '</label></span><br class=form>';
 			}
 			echo '<div class="block grouptoggle">';
-			echo '<img class="mida" src="../img/expand.gif" /> ';
+			echo '<img class="mida" src="'.$staticroot.'/img/expand.gif" /> ';
 			echo _('Course Copy Options');
 			echo '</div>';
 			echo '<div class="blockitems hidden">';
@@ -796,7 +796,7 @@ function courselevelchg(el) {
 		}
 		//Start grouping: Availability and Access
 		echo '<div class="block grouptoggle">';
-		echo '<img class="mida" src="../img/expand.gif" /> ';
+		echo '<img class="mida" src="'.$staticroot.'/img/expand.gif" /> ';
 		echo _('Availability and Access');
 		echo '</div>';
 		echo '<div class="blockitems hidden">';
@@ -839,10 +839,10 @@ function courselevelchg(el) {
 		}
 		echo 'Start: <input type=text size=10 name="sdate" value="'.$sdate.'">
 			<a href="#" onClick="displayDatePicker(\'sdate\', this); return false">
-			<img src="../img/cal.gif" alt="Calendar"/></a> ';
+			<img src="'.$staticroot.'/img/cal.gif" alt="Calendar"/></a> ';
 		echo 'End: <input type=text size=10 name="edate" value="'.$edate.'">
 			<a href="#" onClick="displayDatePicker(\'edate\', this); return false">
-			<img src="../img/cal.gif" alt="Calendar"/></a> ';
+			<img src="'.$staticroot.'/img/cal.gif" alt="Calendar"/></a> ';
 		echo '</span><br class=form />';
 
 		if (!isset($CFG['CPS']['deftime']) || $CFG['CPS']['deftime'][1]==1) {
@@ -885,7 +885,7 @@ function courselevelchg(el) {
 		if (isset($enablebasiclti) && $enablebasiclti==true) {
 			//Start grouping: LMS Integration
 			echo '<div class="block grouptoggle">';
-			echo '<img class="mida" src="../img/expand.gif" /> ';
+			echo '<img class="mida" src="'.$staticroot.'/img/expand.gif" /> ';
 			echo 'LMS Integration (LTI)';
 			echo '</div>';
 			echo '<div class="blockitems hidden">';
@@ -940,7 +940,7 @@ function courselevelchg(el) {
 
 		//Start grouping: Additional Options
 		echo '<div class="block grouptoggle">';
-		echo '<img class="mida" src="../img/expand.gif" /> ';
+		echo '<img class="mida" src="'.$staticroot.'/img/expand.gif" /> ';
 		echo _('Additional Options');
 		echo '</div>';
 		echo '<div class="blockitems hidden">';

diff --git a/admin/groupreportdetails.php b/admin/groupreportdetails.php
@@ -173,7 +173,7 @@ function getRoleNameByRights($rights) {
 }
 
 /******* begin html output ********/
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/tablesorter.js\"></script>\n";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/tablesorter.js\"></script>\n";
 require("../header.php");
 
 if ($overwriteBody==1) {

diff --git a/admin/importlib.php b/admin/importlib.php
@@ -553,7 +553,7 @@ function parselibs($file) {
 	}
 }
 
-$placeinhead = "<link rel=\"stylesheet\" href=\"$imasroot/course/libtree.css\" type=\"text/css\" />";
+$placeinhead = "<link rel=\"stylesheet\" href=\"$staticroot/course/libtree.css\" type=\"text/css\" />";
 
 /******* begin html output ********/
 require("../header.php");

diff --git a/admin/ipedslink.php b/admin/ipedslink.php
@@ -79,7 +79,7 @@
 $stm->execute(array($grp));
 $ipeds = $stm->fetchAll(PDO::FETCH_ASSOC);
 
-$placeinhead .= '<script type="text/javascript" src="'.$imasroot.'/javascript/ipedssearch.js"></script>';
+$placeinhead .= '<script type="text/javascript" src="'.$staticroot.'/javascript/ipedssearch.js"></script>';
 require('../header.php');
 echo '<div class=breadcrumb>'.$breadcrumbbase.' IPEDS/NCES Association</div>';
 echo '<form method=post action="ipedslink.php">';

diff --git a/admin/listdiag.php b/admin/listdiag.php
@@ -79,10 +79,10 @@
 $curBreadcrumb .= _('Diagnostics');
 
 /******* begin html output ********/
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/tablesorter.js\"></script>\n";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/tablesorter.js\"></script>\n";
 $placeinhead .= '<script type="text/javascript">
 $(function() {
-  var html = \'<span class="dropdown"><a role="button" tabindex=0 class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="../img/gears.png" alt="Options"/></a>\';
+  var html = \'<span class="dropdown"><a role="button" tabindex=0 class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="'.$staticroot.'/img/gears.png" alt="Options"/></a>\';
   html += \'<ul role="menu" class="dropdown-menu">\';
   $("tr td:first-child").css("clear","both").each(function (i,el) {
     var href = $(el).find("a").attr("href");

diff --git a/admin/ltiuserprefs.php b/admin/ltiuserprefs.php
@@ -12,7 +12,7 @@
 } else {
 	$greybox = false;
 }
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/jstz_min.js\" ></script>";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/jstz_min.js\" ></script>";
 require('../header.php');
 
 if (isset($_POST['mathdisp'])) {

diff --git a/admin/modcourseorder.php b/admin/modcourseorder.php
@@ -126,7 +126,7 @@ function additems2($list, $status=0) {
 
 $placeinhead = '<style type="text/css">.drag {color:red; background-color:#fcc;} .icon {cursor: pointer;} ul.qview li {padding: 3px}</style>';
 $placeinhead .=  "<script>var AHAHsaveurl = '$imasroot/admin/modcourseorder.php?type=$type';</script>";
-$placeinhead .= "<script src=\"$imasroot/javascript/nestedjq.js?v=050719\"></script>";
+$placeinhead .= "<script src=\"$staticroot/javascript/nestedjq.js?v=050719\"></script>";
 $placeinhead .= '<script type="text/javascript">
  	var noblockcookie=true;
 	var ocnt = 0;

diff --git a/admin/transfercourse.php b/admin/transfercourse.php
@@ -134,7 +134,7 @@
 <p><button type=button @click="loadGroup()">List my group members</button>
 	or lookup a teacher: <input v-model="toLookup" size=30>
 	<button type=button @click="searchTeacher()" :disabled="toLookup.length==0">Search</button>
-	<span v-if="processingSearch" class="noticetext">Looking up teachers... <img src="../img/updating.gif"></span>
+	<span v-if="processingSearch" class="noticetext">Looking up teachers... <img src="<?php echo $staticroot;?>/img/updating.gif"></span>
 </p>
 <p>
 	<button type=submit :disabled="selectedTeacher == 0">Transfer</button>

diff --git a/admin/unhidefromcourselist.php b/admin/unhidefromcourselist.php
@@ -93,7 +93,7 @@
 
 		if ($type=='teach') {
 			echo ' <span class="dropdown"><a role="button" tabindex=0 class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">';
-			echo '<img src="../img/gears.png" alt="Options" class="mida"/></a>';
+			echo '<img src="'.$staticroot.'/img/gears.png" alt="Options" class="mida"/></a>';
 			echo '<ul role="menu" class="dropdown-menu">';
 			echo ' <li><a href="unhidefromcourselist.php?type='.Sanitize::encodeUrlParam($type).'&tohide='.$row['id'].'">'._('Un-hide from course list').'</a></li>';
 			if ($row['ownerid']==$userid && $myrights>20) {
@@ -131,7 +131,7 @@
     echo '<ul class="nomark courselist">';
     foreach ($deleted as $row) {
         echo '<li><span class="dropdown"><a role="button" tabindex=0 class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">';
-        echo '<img src="../img/gears.png" alt="Options" class="mida"/></a>';
+        echo '<img src="'.$staticroot.'/img/gears.png" alt="Options" class="mida"/></a>';
         echo '<ul role="menu" class="dropdown-menu">';
         echo ' <li><a href="unhidefromcourselist.php?type='.Sanitize::encodeUrlParam($type).'&toundel='.$row['id'].'">'._('Un-Delete').'</a></li>';
         echo '</ul></span> ';

diff --git a/admin/userdetails.php b/admin/userdetails.php
@@ -147,7 +147,7 @@ function getRoleNameByRights($rights) {
 }
 
 /******* begin html output ********/
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/tablesorter.js\"></script>\n";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/tablesorter.js\"></script>\n";
 $placeinhead .= '<style type="text/css">
 li.unhide {
   display: none;
@@ -229,7 +229,7 @@ function getRoleNameByRights($rights) {
         echo 'class="hocptd" ';
       }
       echo '>';
-      echo '<img src="../img/gears.png"/> ';
+      echo '<img src="'.$staticroot.'/img/gears.png"/> ';
       echo '<a href="../course/course.php?cid='.Sanitize::encodeUrlParam($course['id']).'">';
       if ($course['available']!=0) {
         echo '<i>';
@@ -274,7 +274,7 @@ function getRoleNameByRights($rights) {
       }
       echo '>';
       if ($course['canedit']) {
-      	      echo '<img src="../img/gears.png"/> ';
+      	      echo '<img src="'.$staticroot.'/img/gears.png"/> ';
       }
       echo '<a href="../course/course.php?cid='.Sanitize::encodeUrlParam($course['id']).'">';
       if ($course['available']!=0) {
@@ -315,7 +315,7 @@ function getRoleNameByRights($rights) {
       }
       echo '>';
       if ($course['canedit']) {
-      	      echo '<img src="../img/gears.png"/> ';
+      	      echo '<img src="'.$staticroot.'/img/gears.png"/> ';
       }
       echo '<a href="../course/course.php?cid='.Sanitize::encodeUrlParam($course['id']).'">';
       if ($course['available']!=0) {
@@ -390,7 +390,7 @@ function hidecourse(el) {
   }
 
   $(function() {
-    var html = \'<span class="dropdown"><a role="button" tabindex=0 class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="../img/gears.png" alt="Options"/></a>\';
+    var html = \'<span class="dropdown"><a role="button" tabindex=0 class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="'.$staticroot.'/img/gears.png" alt="Options"/></a>\';
     html += \'<ul role="menu" class="dropdown-menu">\';
     $("tr td:first-child").css("clear","both").each(function (i,el) {
       var cid = $(el).attr("data-cid");

diff --git a/admin/userlti.php b/admin/userlti.php
@@ -106,7 +106,7 @@
 $curBreadcrumb .= _('LTI Connections');
 
 /******* begin html output ********/
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/tablesorter.js\"></script>\n";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/tablesorter.js\"></script>\n";
 $placeinhead .= '<script type="text/javascript">
 function removeuserlti(el,id) {
   return removelti(el,"user",id);

diff --git a/admin/userreportdetails.php b/admin/userreportdetails.php
@@ -235,8 +235,8 @@ function sortteaching($a,$b) {
 }
 
 /******* begin html output ********/
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/tablesorter.js\"></script>\n";
-$placeinhead .= '<script type="text/javascript" src="'.$imasroot.'/javascript/jquery.validate.min.js?v=122917"></script>';
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/tablesorter.js\"></script>\n";
+$placeinhead .= '<script type="text/javascript" src="'.$staticroot.'/javascript/jquery.validate.min.js?v=122917"></script>';
 $placeinhead .= '<style type="text/css">
 li.unhide {
   display: none;
@@ -330,7 +330,7 @@ function sortteaching($a,$b) {
       }
       echo '>';
       if ($course['canedit']) {
-      	  echo '<img src="../img/gears.png"/> ';
+      	  echo '<img src="'.$staticroot.'/img/gears.png"/> ';
       }
       if ($course['showlink']) {
       	  echo '<a href="../course/course.php?cid='.Sanitize::encodeUrlParam($course['id']).'">';
@@ -393,7 +393,7 @@ function sortteaching($a,$b) {
       }
       echo '>';
       if ($course['canedit']) {
-      	      echo '<img src="../img/gears.png"/> ';
+      	      echo '<img src="'.$staticroot.'/img/gears.png"/> ';
       }
       echo '<a href="../course/course.php?cid='.Sanitize::encodeUrlParam($course['id']).'">';
       if ($course['available']!=0) {
@@ -434,7 +434,7 @@ function sortteaching($a,$b) {
       }
       echo '>';
       if ($course['canedit']) {
-      	      echo '<img src="../img/gears.png"/> ';
+      	      echo '<img src="'.$staticroot.'/img/gears.png"/> ';
       }
       echo '<a href="../course/course.php?cid='.Sanitize::encodeUrlParam($course['id']).'">';
       if ($course['available']!=0) {
@@ -509,7 +509,7 @@ function hidecourse(el) {
   }
 
   $(function() {
-    var html = \'<span class="dropdown"><a role="button" tabindex=0 class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="../img/gears.png" alt="Options"/></a>\';
+    var html = \'<span class="dropdown"><a role="button" tabindex=0 class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img src="'.$staticroot.'/img/gears.png" alt="Options"/></a>\';
     html += \'<ul role="menu" class="dropdown-menu">\';
     $("tr td:first-child").css("clear","both").each(function (i,el) {
       var cid = $(el).attr("data-cid");

diff --git a/admin/userreports.php b/admin/userreports.php
@@ -123,7 +123,7 @@ function getRoleNameByRights($rights) {
 }
 
 /******* begin html output ********/
-$placeinhead = "<script type=\"text/javascript\" src=\"$imasroot/javascript/tablesorter.js\"></script>\n";
+$placeinhead = "<script type=\"text/javascript\" src=\"$staticroot/javascript/tablesorter.js\"></script>\n";
 require("../header.php");
 
 if ($overwriteBody==1) {