diff options
25 files changed, 163 insertions, 154 deletions
diff --git a/RightRolesBeauty.html b/RightRolesBeauty.html index 6f5965b..944b462 100644 --- a/RightRolesBeauty.html +++ b/RightRolesBeauty.html @@ -4,7 +4,7 @@ mysql-query: FROM pbs_right r, pbs_rightcategory rc WHERE r.`rightcategoryID` = rc.`rightcategoryID` --> -<style> +<style type="text/css"> td, th{font-family:verdana, arial, courier;} tr.odd{background-color:#CCC;} tr.even{background-color:#FFF;} diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml index 86c4155..a808047 100644 --- a/application/layouts/default.phtml +++ b/application/layouts/default.phtml @@ -13,9 +13,9 @@ echo $this->headStyle()."\n"; echo $this->headLink()."\n"; echo $this->headScript()."\n"; ?> -<script src='/media/js/jquery.min.js'></script> -<script src='/media/js/jquery-ui.min.js'></script> -<script src='/media/js/script.js'></script> +<script type="text/javascript" src='/media/js/jquery.min.js'></script> +<script type="text/javascript" src='/media/js/jquery-ui.min.js'></script> +<script type="text/javascript" src='/media/js/script.js'></script> </head> <body> <div id='sidepannel'> @@ -57,13 +57,13 @@ echo $this->headScript()."\n"; <div id='debug'> <div class='v1'> <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> - <img src='/media/img/down.png' /> + <img alt="down" src='/media/img/down.png' /> </a> </div> <div class='v2' style='display:none;'> <div style='text-align:right;'> <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> - <img src='/media/img/up.png' /> + <img alt="up" src='/media/img/up.png' /> </a> </div> <?php print_a('Session',$_SESSION,'GET',$_GET,'POST',$_POST); ?> diff --git a/application/modules/dev/forms/FilterEntriesAdd.php b/application/modules/dev/forms/FilterEntriesAdd.php index 758ffbd..bf510eb 100644 --- a/application/modules/dev/forms/FilterEntriesAdd.php +++ b/application/modules/dev/forms/FilterEntriesAdd.php @@ -129,7 +129,7 @@ class dev_Form_FilterEntriesAdd extends Zend_Form } ?> -<script> +<script type="text/javascript"> $('#filtertype').change(function(){ //alert($("#filtertype option:selected").val()); $('#filterentryform').submit(); diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml index 7540d50..6ea324c 100644 --- a/application/modules/fbgui/layouts/fbgui.phtml +++ b/application/modules/fbgui/layouts/fbgui.phtml @@ -22,7 +22,7 @@ echo $this->headScript()."\n"; <script src='/media/js/jquery.keyboard.extension-typing.js'></script> <link href="/media/css/keyboard.css" media="screen" rel="stylesheet" type="text/css" /> -<script> +<script type="text/javascript"> function toggleKeyboard(onoff){ if($('#email').hasClass('qwerty') == false){ $('#email').addClass('qwerty'); diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml index 6917643..dbb221d 100644 --- a/application/modules/fbgui/views/scripts/index/index.phtml +++ b/application/modules/fbgui/views/scripts/index/index.phtml @@ -1,5 +1,5 @@ <?php if(isset($this->entries)):?> - <script> + <script type="text/javascript"> $(document).ready(function(){ $('.menu').click(function(){ $('.menu').removeClass('selected'); diff --git a/application/modules/fbgui/views/scripts/index/start.phtml b/application/modules/fbgui/views/scripts/index/start.phtml index 2c29fa5..4a13191 100644 --- a/application/modules/fbgui/views/scripts/index/start.phtml +++ b/application/modules/fbgui/views/scripts/index/start.phtml @@ -1,4 +1,4 @@ -<style> +<style type="text/css"> /* position the bars and balls correctly (rotate them and translate them outward)*/ .bar1 { -moz-transform:rotate(0deg) translate(0, -40px); @@ -69,7 +69,7 @@ to {-webkit-transform:scale(0.5) rotate(360deg);} } */ </style> -<script> +<script type="text/javascript"> //simple script to rotate all spinners 45 degrees on each tick //this works differently from the css transforms, which is smooth @@ -113,7 +113,7 @@ function updateProgress(p, s, u){ <div id="progressbar" style="height: 15px;"></div> <h1>Downloading</h1> -<script> +<script type="text/javascript"> fbgui.setCallbackOnFinished('foo();'); fbgui.startDownload('http://<?php echo $this->host; ?>/resource/getkernel/alpha/<?php echo $this->alphaid; ?>/file/kernel'); fbgui.startDownload('http://<?php echo $this->host; ?>/resource/getinitramfs/alpha/<?php echo $this->alphaid; ?>/file/initramfs'); diff --git a/application/modules/user/forms/Bootiso.php b/application/modules/user/forms/Bootiso.php index 3f5431c..1fb7ec3 100644 --- a/application/modules/user/forms/Bootiso.php +++ b/application/modules/user/forms/Bootiso.php @@ -111,7 +111,7 @@ class user_Form_Bootiso extends Zend_Form )); ?> - <script> + <script type="text/javascript"> $(document).ready(function(){ changeDepth(); $('#groups .v1').show(); diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php index 5420a83..c9669c7 100644 --- a/application/modules/user/forms/Bootos.php +++ b/application/modules/user/forms/Bootos.php @@ -144,7 +144,7 @@ class user_Form_Bootos extends Zend_Form ?> - <script> + <script type="text/javascript"> $(document).ready(function(){ changeDepth(); $('#groups .v1').show(); diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php index ce2e4de..a49f9af 100644 --- a/application/modules/user/forms/FilterEntry.php +++ b/application/modules/user/forms/FilterEntry.php @@ -363,7 +363,7 @@ class user_Form_FilterEntry extends Zend_Form } ?> -<script> +<script type="text/javascript"> $('#filtertype').change(function(){ //alert($("#filtertype option:selected").val()); $('#filterentryform').submit(); diff --git a/application/modules/user/forms/Login.php b/application/modules/user/forms/Login.php index 342e0b2..3c8a449 100644 --- a/application/modules/user/forms/Login.php +++ b/application/modules/user/forms/Login.php @@ -5,7 +5,7 @@ class user_Form_Login extends Zend_Form public function init() { - $this->setName("Login"); + $this->setName("LoginForm"); $this->setMethod('post'); $this->addElement('text', 'email', array( diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 2886d7a..53d2574 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -1,8 +1,6 @@ <?php echo $this->doctype(); ?> - <html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"> <head> - <?php $request = Zend_Controller_Front::getInstance()->getRequest(); $this->headTitle()->append(ucwords($request->getControllerName())); @@ -13,132 +11,139 @@ echo $this->headStyle()."\n"; echo $this->headLink()."\n"; echo $this->headScript()."\n"; ?> -<script src='/media/js/jquery.min.js'></script> -<script src='/media/js/jquery-ui.min.js'></script> -<script src='/media/js/script.js'></script> -<script src='/media/js/user.js'></script> +<script type="text/javascript" src='/media/js/jquery.min.js'></script> +<script type="text/javascript" src='/media/js/jquery-ui.min.js'></script> +<script type="text/javascript" src='/media/js/script.js'></script> +<script type="text/javascript" src='/media/js/user.js'></script> </head> <body> <div id='sidepannel'> -<div id="logo"> -<div id="logo-bar-gray"></div> -</div> -<div id="sidepannel-top" class='portletNavigationTree'> -<ul class='navTreeLevel0'> - <li class='navTreeItem'><a href='/'><<</a></li> - <li class='navTreeItem'><a href='/user/'>user</a></li> - <li> - <ul class='navTreeLevel1'> - <?php if(Zend_Auth::getInstance()->hasIdentity()) { - echo "<li class='navTreeItem'><a href='/user/person/owndetails'>Own Details</a></li>"; - } - ?> - <?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) { - # This should be splitted - if(Pbs_Acl::checkRight('pso')) - echo "<li class='navTreeItem'><a href='/user/person'>Person</a></li>"; - if(Pbs_Acl::checkRight('gsdo')) - echo "<li class='navTreeItem'><a href='/user/group/show'>Own Group</a></li>"; - if(Pbs_Acl::checkRight('gso')) - echo "<li class='navTreeItem'><a href='/user/group'>Group</a></li>"; - if(Pbs_Acl::checkRight('ro')) - echo "<li class='navTreeItem'><a href='/user/role'>Role</a></li>"; - if(Pbs_Acl::checkRight('bai') || Pbs_Acl::checkRight('bui')) - echo "<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>"; - if(Pbs_Acl::checkRight('pro')) - echo "<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>"; - if(Pbs_Acl::checkRight('booai') || Pbs_Acl::checkRight('booui')) - echo "<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>"; - if(Pbs_Acl::checkRight('csai') || Pbs_Acl::checkRight('csui')) - echo "<li class='navTreeItem'><a href='/user/config'>Config</a></li>"; - if(Pbs_Acl::checkRight('boai') || Pbs_Acl::checkRight('boui')) - echo "<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>"; - if(Pbs_Acl::checkRight('clo')) - echo "<li class='navTreeItem'><a href='/user/client'>Client</a></li>"; - if(Pbs_Acl::checkRight('fo')) - echo "<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>"; - if(Pbs_Acl::checkRight('poo')) - echo "<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>"; - if(Pbs_Acl::checkRight('so')) - echo "<li class='navTreeItem'><a href='/user/session'>Session</a></li>"; - } - ?> - <?php if (!Zend_Auth::getInstance()->hasIdentity()) { - echo "<li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>"; - echo "<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>"; - } else { - if(count(Zend_Session::namespaceGet('userIDs')) > 0) { - echo "<li class='navTreeItem'><a href='/user/person/changemembership'>Change Membership</a></li>"; - } else { - echo "<li class='navTreeItem'><a href='/user/person/selectmembership'>Select Membership</a></li>"; - } - if(Pbs_Acl::checkRight('pdo')) - echo "<li class='navTreeItem'><a href='/user/auth/delete'>Delete Account</a></li>"; - echo "<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>"; - } - ?> - </ul> - </li> -</ul> -</div> + <div id="logo"> + <div id="logo-bar-gray"></div> + </div> + <div id="sidepannel-top" class='portletNavigationTree'> + <ul class='navTreeLevel0'> + <li class='navTreeItem'><a href='/'><<</a></li> + <li class='navTreeItem'><a href='/user/'>user</a></li> + <li> + <ul class='navTreeLevel1'> + <?php if(Zend_Auth::getInstance()->hasIdentity()) { + echo "<li class='navTreeItem'><a href='/user/person/owndetails'>Own Details</a></li>"; + } + ?> + <?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) { + # This should be splitted + if(Pbs_Acl::checkRight('pso')) + echo "<li class='navTreeItem'><a href='/user/person'>Person</a></li>"; + if(Pbs_Acl::checkRight('gsdo')) + echo "<li class='navTreeItem'><a href='/user/group/show'>Own Group</a></li>"; + if(Pbs_Acl::checkRight('gso')) + echo "<li class='navTreeItem'><a href='/user/group'>Group</a></li>"; + if(Pbs_Acl::checkRight('ro')) + echo "<li class='navTreeItem'><a href='/user/role'>Role</a></li>"; + if(Pbs_Acl::checkRight('bai') || Pbs_Acl::checkRight('bui')) + echo "<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>"; + if(Pbs_Acl::checkRight('pro')) + echo "<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>"; + if(Pbs_Acl::checkRight('booai') || Pbs_Acl::checkRight('booui')) + echo "<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>"; + if(Pbs_Acl::checkRight('csai') || Pbs_Acl::checkRight('csui')) + echo "<li class='navTreeItem'><a href='/user/config'>Config</a></li>"; + if(Pbs_Acl::checkRight('boai') || Pbs_Acl::checkRight('boui')) + echo "<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>"; + if(Pbs_Acl::checkRight('clo')) + echo "<li class='navTreeItem'><a href='/user/client'>Client</a></li>"; + if(Pbs_Acl::checkRight('fo')) + echo "<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>"; + if(Pbs_Acl::checkRight('poo')) + echo "<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>"; + if(Pbs_Acl::checkRight('so')) + echo "<li class='navTreeItem'><a href='/user/session'>Session</a></li>"; + } + ?> + <?php if (!Zend_Auth::getInstance()->hasIdentity()) { + echo "<li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>"; + echo "<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>"; + } else { + if(count(Zend_Session::namespaceGet('userIDs')) > 0) { + echo "<li class='navTreeItem'><a href='/user/person/changemembership'>Change Membership</a></li>"; + } else { + echo "<li class='navTreeItem'><a href='/user/person/selectmembership'>Select Membership</a></li>"; + } + if(Pbs_Acl::checkRight('pdo')) + echo "<li class='navTreeItem'><a href='/user/auth/delete'>Delete Account</a></li>"; + echo "<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>"; + } + ?> + </ul> + </li> + </ul> + </div> </div> <div id='main'> -<div id="head-bg"> -<div id="head"> -<h1>pbs<sup>2</sup></h1> -<h2>Rechenzentrum Universität Freiburg</h2> -</div> -</div> -<div id="logo-bar-red"></div> -<div id="head-titlebar"> -<div style='float: right'><?php -if(Zend_Auth::getInstance()->hasIdentity()){ - echo 'Angemeldet als '; - $userIDsNamespace = Zend_Session::namespaceGet('userIDs'); - - if(isset($userIDsNamespace['membershipID'])){ - $membershipMapper = new Application_Model_MembershipMapper(); - $membership = new Application_Model_Membership(); - $membershipMapper->find($userIDsNamespace['membershipID'],$membership); - } - if(isset($userIDsNamespace['personID'])){ - $person = new Application_Model_Person(); - $personMapper = new Application_Model_PersonMapper(); - $personMapper->find($userIDsNamespace['personID'],$person); - echo "<b><i>".$person->getFirstname()." ".$person->getName()."</i></b>"; - } - if(isset($userIDsNamespace['roleID'])){ - echo " in der Rolle "; - - $role = new Application_Model_Role(); - $roleMapper = new Application_Model_RoleMapper(); - $role = $roleMapper->find($userIDsNamespace['roleID']); - echo "<b><i>".$role->getTitle()."</i></b>"; - } -} -?></div> -<?php -echo ucwords($request->getControllerName()) . " > " . ucwords($request->getActionName()); -?></div> -<div id="content"><?php echo $this->layout()->content; ?></div> - -<div id="footer" class="footer flexbox flex"> -<div style='padding: 5px;'><a - onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display -Debug</a> // <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> -// <i>version: 0.1.1</i></div> -</div> + <div id="head-bg"> + <div id="head"> + <h1>pbs<sup>2</sup></h1> + <h2>Rechenzentrum Universität Freiburg</h2> + </div> + </div> + <div id="logo-bar-red"></div> + <div id="head-titlebar"> + <div style='float: right'><?php + if(Zend_Auth::getInstance()->hasIdentity()){ + echo 'Angemeldet als '; + $userIDsNamespace = Zend_Session::namespaceGet('userIDs'); + + if(isset($userIDsNamespace['membershipID'])){ + $membershipMapper = new Application_Model_MembershipMapper(); + $membership = new Application_Model_Membership(); + $membershipMapper->find($userIDsNamespace['membershipID'],$membership); + } + if(isset($userIDsNamespace['personID'])){ + $person = new Application_Model_Person(); + $personMapper = new Application_Model_PersonMapper(); + $personMapper->find($userIDsNamespace['personID'],$person); + echo "<b><i>".$person->getFirstname()." ".$person->getName()."</i></b>"; + } + if(isset($userIDsNamespace['roleID'])){ + echo " in der Rolle "; + + $role = new Application_Model_Role(); + $roleMapper = new Application_Model_RoleMapper(); + $role = $roleMapper->find($userIDsNamespace['roleID']); + echo "<b><i>".$role->getTitle()."</i></b>"; + } + } + ?> + </div> + <?php + echo ucwords($request->getControllerName()) . " > " . ucwords($request->getActionName()); + ?> + </div> + <div id="content"><?php echo $this->layout()->content; ?></div> + <div id="footer" class="footer flexbox flex"> + <div style='padding: 5px;'> + <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> + display Debug + </a> + // <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> + // <i>version: 0.1.1</i> + </div> + </div> </div> - <div id='debug'> -<div class='v1'><a - onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> <img - src='/media/img/down.png' /> </a></div> -<div class='v2' style='display: none;'> -<div style='text-align: right;'><a - onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> <img - src='/media/img/up.png' /> </a></div> -<?php print_a('Session',$_SESSION,'GET',$_GET,'POST',$_POST); ?></div> + <div class='v1'> + <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> + <img alt="down" src='/media/img/down.png' /> + </a> + </div> + <div class='v2' style='display: none;'> + <div style='text-align: right;'> + <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> + <img alt="up" src='/media/img/up.png' /> + </a> + </div> + <?php print_a('Session',$_SESSION,'GET',$_GET,'POST',$_POST); ?></div> </div> </body> -</html> +</html>
\ No newline at end of file diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml index 332a1a4..e4e490f 100644 --- a/application/modules/user/views/scripts/bootmenu/index.phtml +++ b/application/modules/user/views/scripts/bootmenu/index.phtml @@ -188,7 +188,7 @@ <?php echo $this->pagination; ?> -<script> +<script type="text/javascript"> $(document).ready(function(){ $('.actions .play').click(function (){ $("#notification").load($(this).attr('href')).addClass('infobox').show(); diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml index 15918cc..b519140 100644 --- a/application/modules/user/views/scripts/client/index.phtml +++ b/application/modules/user/views/scripts/client/index.phtml @@ -64,7 +64,7 @@ <?php echo $this->pagination; ?> -<script> +<script type="text/javascript"> $(document).ready(function(){ if($('.element').find('.dispnone').length >= 1){ $(this).find('.title').css('cursor','pointer'); diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml index 40a9715..8361ffd 100644 --- a/application/modules/user/views/scripts/config/index.phtml +++ b/application/modules/user/views/scripts/config/index.phtml @@ -83,7 +83,7 @@ <?php echo $this->pagination; ?> -<script> +<script type="text/javascript"> $(document).ready(function(){ if($('.element').find('.dispnone').length >= 1){ $(this).find('.title').css('cursor','pointer'); diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml index f27e333..c8363cd 100644 --- a/application/modules/user/views/scripts/group/show.phtml +++ b/application/modules/user/views/scripts/group/show.phtml @@ -45,7 +45,7 @@ if($this->usergroup == $this->requestgroup){ ?> </div> </div> <div class='bottomimg'> - <img src='/stats/graphgroup/group/<?php echo $this->group->getID();?>' /> + <img alt="" src='/stats/graphgroup/group/<?php echo $this->group->getID();?>' /> </div> <?php diff --git a/application/modules/user/views/scripts/index/index.phtml b/application/modules/user/views/scripts/index/index.phtml index 4acdfca..b3e872f 100644 --- a/application/modules/user/views/scripts/index/index.phtml +++ b/application/modules/user/views/scripts/index/index.phtml @@ -8,6 +8,5 @@ <li><a href='<?php echo $link;?>'><?php echo $text;?></a></li> <?php endforeach ?> </ul> -</div> <?php endif ?> - +</div> diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml index 93dfd78..515f9da 100644 --- a/application/modules/user/views/scripts/person/index.phtml +++ b/application/modules/user/views/scripts/person/index.phtml @@ -138,7 +138,7 @@ if($this->suspendRight === true) { <?php echo $this->pagination; ?> -<script> +<script type="text/javascript"> $(document).ready(function(){ if($('.element').find('.dispnone').length >= 1){ $(this).find('.title').css('cursor','pointer'); diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml index 74d00cf..2aaef54 100644 --- a/application/modules/user/views/scripts/person/owndetails.phtml +++ b/application/modules/user/views/scripts/person/owndetails.phtml @@ -1,5 +1,5 @@ <h1>Own Details</h1> -<style> +<style type="text/css"> label { width: 150px !important; } diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml index e82c4d9..6283808 100644 --- a/application/modules/user/views/scripts/person/show.phtml +++ b/application/modules/user/views/scripts/person/show.phtml @@ -1,4 +1,9 @@ <h1>Person</h1> +<style type="text/css"> +label { + width: 150px !important; +} +</style> <?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array( 'onclick' => 'self.location="/user/person/edit/personID/' . $this->personID . '"', 'class' => 'rightbutton')) ?> diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml index 49ad5f7..56ae8d5 100644 --- a/application/modules/user/views/scripts/pool/index.phtml +++ b/application/modules/user/views/scripts/pool/index.phtml @@ -176,7 +176,7 @@ </div> </div> <script type='text/javascript' src='/media/js/jquery.highlight-3.js'></script> -<script> +<script type="text/javascript"> jQuery.expr[":"].containsNoCase = function(el, i, m) { var search = m[3]; if (!search) return false; diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml index 620fb4f..0a7a3d3 100644 --- a/application/modules/user/views/scripts/preboot/index.phtml +++ b/application/modules/user/views/scripts/preboot/index.phtml @@ -86,7 +86,7 @@ <?php echo $this->pagination; ?> -<script> +<script type="text/javascript"> $(document).ready(function(){ if($('.element').find('.dispnone').length >= 1){ $(this).find('.title').css('cursor','pointer'); diff --git a/application/modules/user/views/scripts/role/add.phtml b/application/modules/user/views/scripts/role/add.phtml index 59c0dae..ef49e05 100644 --- a/application/modules/user/views/scripts/role/add.phtml +++ b/application/modules/user/views/scripts/role/add.phtml @@ -4,7 +4,7 @@ $this->addForm->setAction($this->url()); echo $this->addForm; ?> -<script> +<script type="text/javascript"> $(document).ready(function(){ $('fieldset').children('dl:gt(0)').hide(); $('fieldset fieldset>legend').css('cursor','pointer'); diff --git a/application/modules/user/views/scripts/role/linkright.phtml b/application/modules/user/views/scripts/role/linkright.phtml index 06863d4..385fb2d 100644 --- a/application/modules/user/views/scripts/role/linkright.phtml +++ b/application/modules/user/views/scripts/role/linkright.phtml @@ -4,7 +4,7 @@ $this->linkForm->setAction($this->url()); echo $this->linkForm; ?> -<script> +<script type="text/javascript"> $(document).ready(function(){ $('fieldset').children('dl:gt(0)').hide(); $('fieldset fieldset>legend').css('cursor','pointer'); diff --git a/library/Pbs/Search.php b/library/Pbs/Search.php index a148b08..a398c0f 100644 --- a/library/Pbs/Search.php +++ b/library/Pbs/Search.php @@ -19,8 +19,8 @@ class Pbs_Search{ $str .= "/user/".$this->module."/search/type/".$this->type; } $str .= "'> - <input type='text' id='search' name='search' ".(($this->searchTerm != '')?'value="'.htmlentities($this->searchTerm, ENT_QUOTES).'"':'')."> - <button type='submit' class='searchbutton' value='search'> Search</button>"; + <div><input type='text' id='search' name='search' ".(($this->searchTerm != '')?'value="'.htmlentities($this->searchTerm, ENT_QUOTES).'"':'')." /> + <button type='submit' class='searchbutton' value='search'> Search</button></div>"; $highlight = array(); if($this->searchTerm != ''){ @@ -37,7 +37,7 @@ class Pbs_Search{ } $str .= "<div class='searchsub dsf'>Display searchfilter</div>"; - $str .= "<script> + $str .= "<script type='text/javascript'> $(document).ready(function(){"; $str .= implode("\n",$highlight); $str .= "$('.searchvars').data('m','0');\n"; diff --git a/send-post.html b/send-post.html index addeec8..7769c19 100644 --- a/send-post.html +++ b/send-post.html @@ -1,6 +1,6 @@ <html> <title>Post-Data</title> -<style> +<style type="text/css"> fieldset{margin-bottom:20px;border:none;border-top:1px solid red;} fieldset legend{color:red;} label{float:left;width:125px;} |