diff options
| author | michael pereira | 2011-03-04 03:21:32 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-04 03:21:32 +0100 |
| commit | e2db1dc442e9f28fe666537a8af024c810912bb4 (patch) | |
| tree | de16d36dff50a950dd963788689e18576a6db02f /application/views/scripts | |
| parent | Inserted deleteForm (diff) | |
| parent | Änderungen an den Filtern (diff) | |
| download | pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.tar.gz pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.tar.xz pbs2-e2db1dc442e9f28fe666537a8af024c810912bb4.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Conflicts:
.zfproject.xml
Diffstat (limited to 'application/views/scripts')
| -rw-r--r-- | application/views/scripts/auth/delete.phtml | 5 | ||||
| -rw-r--r-- | application/views/scripts/filter/editfilter.phtml | 1 | ||||
| -rw-r--r-- | application/views/scripts/filter/index.phtml | 10 | ||||
| -rw-r--r-- | application/views/scripts/filter/removefilter.phtml | 1 |
4 files changed, 16 insertions, 1 deletions
diff --git a/application/views/scripts/auth/delete.phtml b/application/views/scripts/auth/delete.phtml index 3b7085d..8f269a0 100644 --- a/application/views/scripts/auth/delete.phtml +++ b/application/views/scripts/auth/delete.phtml @@ -1 +1,4 @@ -<br /><br /><center>View script for controller <b>Auth</b> and script/action name <b>deleteAccount</b></center>
\ No newline at end of file +<?php +$this->deleteForm->setAction($this->url()); +echo $this->deleteForm; +?> diff --git a/application/views/scripts/filter/editfilter.phtml b/application/views/scripts/filter/editfilter.phtml new file mode 100644 index 0000000..452a096 --- /dev/null +++ b/application/views/scripts/filter/editfilter.phtml @@ -0,0 +1 @@ +<br /><br /><center>View script for controller <b>Filter</b> and script/action name <b>editfilter</b></center>
\ No newline at end of file diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml index 0f9b51e..33043dc 100644 --- a/application/views/scripts/filter/index.phtml +++ b/application/views/scripts/filter/index.phtml @@ -13,10 +13,20 @@ <table border=1> <tr> <th>filterid</th> + <th>filterID</th> </tr> <?php foreach ($this->filters as $filter): ?> <tr> + <td><?php echo $this->escape($filter->getID()) ?></td> <td><?php echo $this->escape($filter->title) ?></td> + <td><a href="<?php echo $this->url( + array( + 'controller' => 'filter', + 'action' => 'editfilter', + 'filterID' => $filter->getID() + ), + 'default', + true) ?>">edit filter</a></td> </tr> <?php endforeach ?> diff --git a/application/views/scripts/filter/removefilter.phtml b/application/views/scripts/filter/removefilter.phtml new file mode 100644 index 0000000..a46f9ec --- /dev/null +++ b/application/views/scripts/filter/removefilter.phtml @@ -0,0 +1 @@ +<br /><br /><center>View script for controller <b>Filter</b> and script/action name <b>removefilter</b></center>
\ No newline at end of file |