summaryrefslogtreecommitdiffstats
path: root/application/modules/dev
diff options
context:
space:
mode:
authormichael pereira2011-03-16 10:09:45 +0100
committermichael pereira2011-03-16 10:09:45 +0100
commitaa44f9fcb6273a9e20596e788b10c240601c3d1d (patch)
tree154813670be6d64322eecdd04084ba232554e3a0 /application/modules/dev
parentRessource Controller setzt jetzt die Session fuer ausgewaehltes Bootmenuentry (diff)
parentaufruf verschoben (diff)
downloadpbs2-aa44f9fcb6273a9e20596e788b10c240601c3d1d.tar.gz
pbs2-aa44f9fcb6273a9e20596e788b10c240601c3d1d.tar.xz
pbs2-aa44f9fcb6273a9e20596e788b10c240601c3d1d.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/dev')
-rw-r--r--application/modules/dev/controllers/GroupController.php4
-rw-r--r--application/modules/dev/controllers/IndexController.php2
-rw-r--r--application/modules/dev/controllers/PersonController.php4
-rw-r--r--application/modules/dev/controllers/RoleController.php2
-rw-r--r--application/modules/dev/layouts/dev.phtml6
-rw-r--r--application/modules/dev/views/scripts/group/edit.phtml4
-rw-r--r--application/modules/dev/views/scripts/group/index.phtml2
-rw-r--r--application/modules/dev/views/scripts/group/show.phtml10
8 files changed, 17 insertions, 17 deletions
diff --git a/application/modules/dev/controllers/GroupController.php b/application/modules/dev/controllers/GroupController.php
index 0456665..1a063a7 100644
--- a/application/modules/dev/controllers/GroupController.php
+++ b/application/modules/dev/controllers/GroupController.php
@@ -20,8 +20,8 @@ class dev_GroupController extends Zend_Controller_Action
$this->personmapper = new Application_Model_PersonMapper();
$this->rolemapper = new Application_Model_RoleMapper();
$this->groupList = $this->groupMapper->fetchAll();
- } else {
- $this->_helper->redirector('dev', 'login', 'auth');
+ } else {
+ $this->_redirect('/dev/login/auth');
}
}
diff --git a/application/modules/dev/controllers/IndexController.php b/application/modules/dev/controllers/IndexController.php
index 4c9385c..f261304 100644
--- a/application/modules/dev/controllers/IndexController.php
+++ b/application/modules/dev/controllers/IndexController.php
@@ -11,9 +11,9 @@ class dev_IndexController extends Zend_Controller_Action
public function indexAction()
{
// action body
+
}
-
}
diff --git a/application/modules/dev/controllers/PersonController.php b/application/modules/dev/controllers/PersonController.php
index 74c58c7..b7e050f 100644
--- a/application/modules/dev/controllers/PersonController.php
+++ b/application/modules/dev/controllers/PersonController.php
@@ -30,13 +30,13 @@ class dev_PersonController extends Zend_Controller_Action
}
}
} else {
- $this->_helper->redirector('dev','login', 'auth');
+ $this->_redirect('/dev/auth/login');
}
}
public function indexAction()
{
- $this->_helper->redirector('dev','show', 'person');
+ $this->_redirect('/dev/person/show');
}
public function showAction()
diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php
index 2f2de2d..3b45a8c 100644
--- a/application/modules/dev/controllers/RoleController.php
+++ b/application/modules/dev/controllers/RoleController.php
@@ -8,7 +8,7 @@ class dev_RoleController extends Zend_Controller_Action
if (Zend_Auth::getInstance()->hasIdentity()) {
} else {
- $this->_helper->redirector('dev', 'login', 'auth');
+ $this->_redirect('/dev/login/auth');
}
}
diff --git a/application/modules/dev/layouts/dev.phtml b/application/modules/dev/layouts/dev.phtml
index f48b9ad..2c7f6f0 100644
--- a/application/modules/dev/layouts/dev.phtml
+++ b/application/modules/dev/layouts/dev.phtml
@@ -13,9 +13,9 @@ echo $this->headStyle()."\n";
echo $this->headLink()."\n";
echo $this->headScript()."\n";
?>
-<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
+<link href="/media/css/jquery-ui.css" rel="stylesheet" type="text/css"/>
+<script src="/media/js/jquery.min.js"></script>
+<script src="/media/js/jquery-ui.min.js"></script>
</head>
<body>
diff --git a/application/modules/dev/views/scripts/group/edit.phtml b/application/modules/dev/views/scripts/group/edit.phtml
index 64dde9d..dd3acbe 100644
--- a/application/modules/dev/views/scripts/group/edit.phtml
+++ b/application/modules/dev/views/scripts/group/edit.phtml
@@ -1,10 +1,10 @@
<?php
if(isset($this->addForm)) {
- $this->addForm->setAction('/group/add');
+ $this->addForm->setAction('/etc/group/add');
echo $this->addForm;
}
else {
$this->editForm->setAction($this->url());
echo $this->editForm;
}
-?> \ No newline at end of file
+?>
diff --git a/application/modules/dev/views/scripts/group/index.phtml b/application/modules/dev/views/scripts/group/index.phtml
index d1faf04..714498e 100644
--- a/application/modules/dev/views/scripts/group/index.phtml
+++ b/application/modules/dev/views/scripts/group/index.phtml
@@ -10,7 +10,7 @@
<tr>
<td><?php echo $group->getTitle(); ?></td>
<td>
- <form name="show<?php echo $count; ?>" action="/group/show"
+ <form name="show<?php echo $count; ?>" action="/dev/group/show"
method="post"><input type="hidden" name="groupID"
value="<?php echo $group->getID(); ?>" /><a
href="javascript:document.show<?php echo $count; ?>.submit();">Details</a></form>
diff --git a/application/modules/dev/views/scripts/group/show.phtml b/application/modules/dev/views/scripts/group/show.phtml
index addf3db..7b3660d 100644
--- a/application/modules/dev/views/scripts/group/show.phtml
+++ b/application/modules/dev/views/scripts/group/show.phtml
@@ -2,11 +2,11 @@
if($_POST['groupID']) {
?>
<div align="right">
-<form name="editForm" action="/group/edit/" method="post"><input
+<form name="editForm" action="/dev/group/edit/" method="post"><input
type="hidden" name="groupID"
value="<?php echo $this->group->getID(); ?>" /> <input type="submit"
name="edit" value="Edit" /></form>
-<form name="deleteForm" action="/group/delete/" method="post"><input
+<form name="deleteForm" action="/dev/group/delete/" method="post"><input
type="hidden" name="groupID"
value="<?php echo $this->group->getID(); ?>" /> <input type="submit"
name="delete" value="Delete" /></form>
@@ -56,7 +56,7 @@ if($_POST['groupID']) {
<td><?php echo $person->getEmail(); ?></td>
<td><?php echo $person->getCity(); ?></td>
<td>
- <form action="/group/grantperson" method="post"><input type="hidden"
+ <form action="/dev/group/grantperson" method="post"><input type="hidden"
name="grouprequestID" value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
<input type="submit" name="confirm" value="confirm" /></form>
</td>
@@ -92,7 +92,7 @@ if($_POST['groupID']) {
<td><?php echo $person->getEmail(); ?></td>
<td><?php echo $person->getCity(); ?></td>
<td>
- <form action="/group/revokeperson" method="post"><input type="hidden"
+ <form action="/dev/group/revokeperson" method="post"><input type="hidden"
name="membershipID" value="<?php echo $membershipID; ?>" /><input
type="hidden" name="personID" value="<?php echo $person->getID(); ?>" />
<input type="submit" name="revoke" value="revoke" /></form>
@@ -119,4 +119,4 @@ function printRoleSelect($roleList) {
echo "<option value=\"" . $role['roleID'] . "\">" . $role['title'] . "</option>";
}
echo "</select>";
-} \ No newline at end of file
+}