diff options
Diffstat (limited to 'h-source/Application/Views')
| -rw-r--r-- | h-source/Application/Views/Issues/view.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Issues/viewall.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/climb.php | 50 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/differences.php | 61 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/form.php | 96 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/history.php | 70 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/not_found.php | 34 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/page.php | 102 | ||||
| -rw-r--r-- | h-source/Application/Views/Wiki/talk.php | 122 | ||||
| -rw-r--r-- | h-source/Application/Views/right.php | 6 | ||||
| -rw-r--r-- | h-source/Application/Views/talk.php | 4 |
11 files changed, 543 insertions, 6 deletions
diff --git a/h-source/Application/Views/Issues/view.php b/h-source/Application/Views/Issues/view.php index d5e536e..0af4780 100644 --- a/h-source/Application/Views/Issues/view.php +++ b/h-source/Application/Views/Issues/view.php @@ -223,7 +223,7 @@ <?php } else { ?> <div class="talk_login_notice"> - <a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang";?>">login</a> <?php echo gtext("in order to submit a message to this issue");?></a> + <a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$this->controller."/".$this->action.$queryString;?>">login</a> <?php echo gtext("in order to submit a message to this issue");?></a> </div> <?php } ?> diff --git a/h-source/Application/Views/Issues/viewall.php b/h-source/Application/Views/Issues/viewall.php index b47294f..0374fc7 100644 --- a/h-source/Application/Views/Issues/viewall.php +++ b/h-source/Application/Views/Issues/viewall.php @@ -110,7 +110,7 @@ <?php } else { ?> <div class="talk_login_notice"> - <a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang";?>">login</a> <?php echo gtext("in order to submit an issue");?></a> + <a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$this->controller."/".$this->action.$queryString;?>">login</a> <?php echo gtext("in order to submit an issue");?></a> </div> <?php } ?> diff --git a/h-source/Application/Views/Wiki/climb.php b/h-source/Application/Views/Wiki/climb.php new file mode 100644 index 0000000..bd502d1 --- /dev/null +++ b/h-source/Application/Views/Wiki/climb.php @@ -0,0 +1,50 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?php +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. +?> + <div id="left"> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo $tree;?> + </div> + + <div class="notebook_view_title"> + <?php echo gtext('Make this revision the current revision of the page'); ?> <b><?php echo $tree_name;?></b> + </div> + + <div class="notebook_insert_link"> + <a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> + </div> + + <div class="wiki_external_box"> + + <?php echo $notice;?> + + <div class="climb_form_ext_box"> + + <?php if (strcmp($isDeleted,'no') === 0 ) { ?> + <form action="<?php echo $this->currPage."/$lang/$id_rev"; ?>" method="POST"> + <?php echo gtext('I want to make this revision the current revision');?>: <input type="submit" name="confirmAction" value="<?php echo gtext('Confirm');?>"> + </form> + <?php } ?> + + </div> + + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/Wiki/differences.php b/h-source/Application/Views/Wiki/differences.php new file mode 100644 index 0000000..1709cbf --- /dev/null +++ b/h-source/Application/Views/Wiki/differences.php @@ -0,0 +1,61 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?php +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. +?> + + <div id="left"> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo $tree;?> + </div> + + <?php if ($showDiff === true) { ?> + <div class="notebook_view_title"> + Differences between the revision of <b><?php echo smartDate($update_new);?></b>, created by <b><?php echo getLinkToUser($u->getUser($created_by));?></b>, and the revision of <b><?php echo smartDate($update_old);?></b> + </div> + <?php } ?> + + <div class="notebook_insert_link"> + <a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> + </div> + + <div class="wiki_external_box"> + + <div class="diff_color_notice"> + <b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed. + </div> + + <?php foreach ($diffArray as $label => $text) { ?> + + <div class="diff_ext_box"> + + <div class="diff_item_label"> + <?php echo gtext("differences in the entry");?>: <b><?php echo $label;?></b> + </div> + + <div class="diff_item_text"> + <?php echo in_array($label,$fieldsWithBreaks) ? nl2br($text) : $text;?> + </div> + + </div> + + <?php } ?> + + </div> diff --git a/h-source/Application/Views/Wiki/form.php b/h-source/Application/Views/Wiki/form.php new file mode 100644 index 0000000..0a448dd --- /dev/null +++ b/h-source/Application/Views/Wiki/form.php @@ -0,0 +1,96 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?php +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. +?> + + <script> + + $(document).ready(function() { + + $("#bb_code").markItUp(mySettings); + + }); + + </script> + + <div id="left"> + + <?php if ( strcmp($this->action,'insert') === 0 ) { ?> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> » <?php echo gtext('Insert'); ?> + </div> + + <div class="notebook_view_title"> + <?php echo gtext('Insert a new wiki page'); ?> + </div> + + <div class="notebook_insert_link"> + <a title="Back to the wiki main page" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/";?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> + </div> + + <?php } else if ( strcmp($this->action,'update') === 0 ) { ?> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo $tree_name;?></a> » <?php echo gtext('Update'); ?> + </div> + + <div class="notebook_view_title"> + <?php echo gtext('Edit the wiki page'); ?> <b><?php echo $tree_name;?></b> + </div> + + <div class="notebook_insert_link"> + <a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/".encodeUrl($tree_name);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> + </div> + + <?php } ?> + + <div class="top_licence_notice"> + <div><b>License Informations:</b></div> + Any text submitted by you will be put in the Public Domain (see the <a href="http://creativecommons.org/publicdomain/zero/1.0/">CC0 page</a> for detailed information). + </div> + + <?php echo $notice;?> + + <div class="notebooks_insert_form"> + + <form action="<?php echo $this->baseUrl."/".$this->controller."/".$this->action."/$lang";?>" method="POST"> + + <div class="edit_form"> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("title");?>:</div> + <?php echo Html_Form::input('title',$values['title'],'input_entry');?> + </div> + + <div class="form_entry"> + <div class="entry_label"><?php echo gtext("text of the wiki page");?>:<br /><a href="<?php echo $this->baseUrl."/help/index/$lang#wiki-syntax";?>"><?php echo gtext("discover all the wiki tags");?></a></div> + <?php echo Html_Form::textarea('page',$values['page'],'textarea_entry','bb_code');?> + </div> + + <?php echo $hiddenInput;?> + + <input type="submit" name="<?php echo $submitName;?>" value="Save"> + + </div> + + </form> + </div> + diff --git a/h-source/Application/Views/Wiki/history.php b/h-source/Application/Views/Wiki/history.php new file mode 100644 index 0000000..b979063 --- /dev/null +++ b/h-source/Application/Views/Wiki/history.php @@ -0,0 +1,70 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?php +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. +?> + + <div id="left"> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>"><?php echo $tree_name;?></a> » <?php echo gtext('History');?> + </div> + + <div class="notebook_view_title"> + History of the wiki page <b><?php echo $tree_name;?></b> + </div> + + <div class="notebook_insert_link"> + <a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/".encodeUrl($tree_name);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> + </div> + + <div class="wiki_external_box"> + + <ul class="page_history"> + + <?php if ($this->viewArgs['page'] === 1) { ?> + <?php foreach ($rev1 as $rev) { ?> + <li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['wiki']['update_date']);?> by <?php echo getLinkToUser($u->getUser($rev['wiki']['created_by']));?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li> + <?php } ?> + <?php } ?> + + <?php foreach ($rev2 as $rev) { ?> + <li class="page_history_item"> + + <a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['wiki_revisions']['update_date']);?></a> by <?php echo getLinkToUser($u->getUser($rev['wiki_revisions']['created_by']));?> + + <?php if (strcmp($rev['wiki_revisions']['id_rev'],$firstRev) !== 0) {?> + (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/".$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>">diff</a>) + <?php } ?> + + <?php if ($islogged === 'yes') { ?> + (<a href="<?php echo $this->baseUrl.'/'.$this->controller.'/climb/'.$lang.'/'.$rev['wiki_revisions']['id_rev'].$this->viewStatus;?>"><?php echo gtext('Make current'); ?></a>) + <?php } ?> + + </li> + <?php } ?> + + </ul> + + </div> + + <div class="history_page_list"> + <?php echo gtext("page list");?>: <?php echo $pageList;?> + </div> + diff --git a/h-source/Application/Views/Wiki/not_found.php b/h-source/Application/Views/Wiki/not_found.php new file mode 100644 index 0000000..dc95c21 --- /dev/null +++ b/h-source/Application/Views/Wiki/not_found.php @@ -0,0 +1,34 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?php +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. +?> + + <div id="left"> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> » <?php echo gtext('Page not-found'); ?> + </div> + + <div class="wiki_external_box"> + <div> + <?php echo gtext('the wiki page has not been found');?> + </div> + </div> + diff --git a/h-source/Application/Views/Wiki/page.php b/h-source/Application/Views/Wiki/page.php new file mode 100644 index 0000000..92e3c9b --- /dev/null +++ b/h-source/Application/Views/Wiki/page.php @@ -0,0 +1,102 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?php +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. +?> + + <div id="left"> + + <?php $tableName = strcmp($this->action,'page') === 0 ? 'wiki' : 'wiki_revisions'; ?> + + <?php if ( strcmp($this->action,'page') === 0 ) { ?> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/wiki/page/$lang";?>">Wiki</a> » <?php echo $tree_name;?> + </div> + + <div class="notebook_insert_link"> + <div class="view_page_history_button"> + <a title="talk page" href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/talk-60.png"></a> + </div> + + <div class="view_page_history_button"> + <a title="history page" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/$id_wiki";?>"><img class="top_left_note_image" src="<?php echo $this->baseUrl;?>/Public/Img/history-60.png"></a> + </div> + + <?php if (strcmp($isDeleted,'no') === 0) { ?> + <div class="view_page_update_button"> + <form action="<?php echo $this->baseUrl."/".$this->controller."/update/$lang";?>" method="POST"> + <input title="edit page" class="update_submit_class" type="image" src="<?php echo $this->baseUrl;?>/Public/Img/edit-60.png" value="xedit"> + <input type="hidden" name="id_wiki" value="<?php echo $id_wiki;?>"> + </form> + </div> + <?php } ?> + </div> + + <div class="talk_numb_ext"> + <a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>">talk messages: <?php echo $talk_number;?></a> + </div> + + <?php } else if ( strcmp($this->action,'revision') === 0 ) { ?> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo $tree; ?> + </div> + + <div class="notebook_view_title"> + Revision of the wiki page <b><?php echo $tree_name;?></b> + </div> + + <div class="notebook_insert_link"> + <a title="Back to the history of the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/history/$lang/".$id_wiki.$this->viewStatus;?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> + </div> + + <?php } ?> + + <div class="wiki_external_box"> + + <?php if ( strcmp($isDeleted,'yes') === 0 ) { ?> + + <div class="revision_alert"> + <?php echo gtext('This wiki page has been hidden'); ?> + </div> + + <?php } ?> + + <?php if ( strcmp($isDeleted,'no') === 0 or $ismoderator) { ?> + + <!--if revision--> + <?php if (strcmp($this->action,'revision') === 0) { ?> + <div class="revision_alert"> + This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($created_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($tree_name);?>">current revision</a>. + </div> + <?php } ?> + + <?php foreach ($table as $page) { ?> + <div class="wiki_page_title"> + <?php echo $page[$tableName]['title']?> + </div> + <div class="wiki_page_content"> + <?php echo decodeWikiText($page[$tableName]['page'])?> + </div> + <?php } ?> + + <? } ?> + + </div> diff --git a/h-source/Application/Views/Wiki/talk.php b/h-source/Application/Views/Wiki/talk.php new file mode 100644 index 0000000..67ecbeb --- /dev/null +++ b/h-source/Application/Views/Wiki/talk.php @@ -0,0 +1,122 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?php +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. +?> + + <script> + + $(document).ready(function() { + + $("#bb_code").markItUp(mySettings); + + }); + + </script> + + <div id="left"> + + <div class="position_tree_box"> + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <?php echo $tree; ?> + </div> + + <div class="notebook_view_title"> + <?php echo gtext('Talk page of the wiki page'); ?> <b><?php echo $tree_name;?></b> + </div> + + <div class="notebook_insert_link"> + <a title="Back to the page <?php echo $tree_name;?>" href="<?php echo $this->baseUrl."/".$this->controller."/page/$lang/".encodeUrl($tree_name);?>"><img class="top_left_images" src="<?php echo $this->baseUrl;?>/Public/Img/back-60.png"></a> + </div> + + <div class="wiki_external_box"> + + <?php foreach ($table as $message) { ?> + + <?php if (strcmp($message['wiki_talk']['deleted'],'no') === 0) { ?> + + <a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a> + <div class="talk_message_item"> + + <div class="talk_message_item_title_date"> + + <div class="talk_message_item_title"> + <?php echo $message['wiki_talk']['title'];?> + </div> + + <div class="talk_message_item_date"> + by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?> + </div> + </div> + + <div class="talk_message_item_content"> + <?php echo decodeWikiText($message['wiki_talk']['message']);?> + </div> + + </div> + + <?php } else { ?> + + + + <?php } ?> + + <?php } ?> + </div> + + <?php if ($islogged === 'yes') { ?> + + <div class="talk_form_external_box"> + <div class="talk_login_notice"> + <a name="form">Add a message</a> + </div> + + <?php echo $notice;?> + + <div class="notebooks_insert_form"> + <form action="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_wiki";?>#form" method="POST"> + + <div class="edit_form"> + + <div class="form_entry"> + <div class="entry_label">Title:</div> + <?php echo Html_Form::input('title',$values['title'],'talk_input_entry');?> + </div> + + <div class="form_entry"> + <div class="entry_label">Message:</div> + <?php echo Html_Form::textarea('message',$values['message'],'talk_textarea_entry','bb_code');?> + </div> + + <input type="submit" name="insertAction" value="Save"> + + </div> + + </form> + </div> + </div> + + <?php } else { ?> + + <div class="talk_login_notice"> + <a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$this->controller."/".$this->action.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a> + </div> + + <?php } ?> + + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/right.php b/h-source/Application/Views/right.php index bc97fba..b931151 100644 --- a/h-source/Application/Views/right.php +++ b/h-source/Application/Views/right.php @@ -30,10 +30,12 @@ <div class="login_table_box"> + <?php $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index'; ?> + <?php if ($islogged === 'yes') { ?> <div class="login_box_logged"> <div class="who_you_are_and_logout"> - <?php echo gtext("Hello");?> <b><?php echo $username; ?></b> (<a href="<?php echo $this->baseUrl."/users/logout/".Lang::$current;?>">logout</a>) + <?php echo gtext("Hello");?> <b><?php echo $username; ?></b> (<a href="<?php echo $this->baseUrl."/users/logout/$lang?redirect=".$currPos.$queryString;?>">logout</a>) </div> <div class="your_panel_link"> <?php echo gtext("Your");?> <a href="<?php echo $this->baseUrl."/my/home/$lang";?>"><?php echo gtext("control panel");?></a> @@ -45,7 +47,7 @@ Login form: </div> <!--login form--> - <form action="<?php echo $this->baseUrl."/users/login/$lang";?>" method="POST"> + <form action="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$currPos.$queryString;?>" method="POST"> <div class="login_right_box"> <div class="login_right_item"> diff --git a/h-source/Application/Views/talk.php b/h-source/Application/Views/talk.php index 11f6bbc..a5de7d9 100644 --- a/h-source/Application/Views/talk.php +++ b/h-source/Application/Views/talk.php @@ -45,7 +45,7 @@ <?php } ?> <div class="talk_message_item_title"> - <?php echo eg_strtoupper($message['talk']['title']);?> + <?php echo $message['talk']['title'];?> </div> <div class="talk_message_item_date"> @@ -140,7 +140,7 @@ <?php } else { ?> <div class="talk_login_notice"> - <a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang/".$this->controller."/view/$id_hard";?>">login</a> <?php echo gtext("in order to add a message");?></a> + <a name="form"><?php echo gtext("You have to");?> <a href="<?php echo $this->baseUrl."/users/login/$lang?redirect=".$this->controller."/".$this->action.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a> </div> <?php } ?>
\ No newline at end of file |