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/talk.php | 44 | ||||
| -rw-r--r-- | h-source/Application/Views/header.php | 1 | ||||
| -rw-r--r-- | h-source/Application/Views/right.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/talk.php | 2 |
6 files changed, 46 insertions, 7 deletions
diff --git a/h-source/Application/Views/Issues/view.php b/h-source/Application/Views/Issues/view.php index 0af4780..bcd0265 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?redirect=".$this->controller."/".$this->action.$queryString;?>">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=".$currPos.$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 0374fc7..e31a7f3 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?redirect=".$this->controller."/".$this->action.$queryString;?>">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=".$currPos.$queryString;?>">login</a> <?php echo gtext("in order to submit an issue");?></a> </div> <?php } ?> diff --git a/h-source/Application/Views/Wiki/talk.php b/h-source/Application/Views/Wiki/talk.php index 67ecbeb..9835f04 100644 --- a/h-source/Application/Views/Wiki/talk.php +++ b/h-source/Application/Views/Wiki/talk.php @@ -54,7 +54,10 @@ <div class="talk_message_item"> <div class="talk_message_item_title_date"> - + <?php if ($ismoderator) { ?> + <a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hide_wiki_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_cancel.png">hide</a> + <?php } ?> + <div class="talk_message_item_title"> <?php echo $message['wiki_talk']['title'];?> </div> @@ -68,11 +71,48 @@ <?php echo decodeWikiText($message['wiki_talk']['message']);?> </div> + <?php if ($ismoderator) { ?> + <!--view details--> + <div class="show_hidden_box_ext"> + <div class="md_type">wiki_talk</div> + <a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a> + <div class="moderation_details_box"></div> + </div> + <?php } ?> + </div> <?php } else { ?> + <?php if ($ismoderator) { ?> + <a name="wiki-talk-<?php echo $message['wiki_talk']['id_talk'];?>"></a> + <div class="talk_message_item_hidden"> + this message has been deleted + + <a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="show_wiki_talk hide_general" href="<?php echo $this->baseUrl."/home/index/$lang";?>"><img src="<?php echo $this->baseUrl;?>/Public/Img/Crystal/button_ok.png">make visible</a> + + <!--view details--> + <div class="show_hidden_box_ext"> + <div class="md_type">wiki_talk</div> + <a id="<?php echo $message['wiki_talk']['id_talk'];?>" class="hidden_message_view_details" href="<?php echo $this->baseUrl."/home/index/$lang";?>">view details</a> + + <div class="details_of_hidden_message"> + <div class="details_of_hidden_message_inner"> + <div class="talk_message_item_date"> + submitted by <?php echo getLinkToUser($u->getUser($message['wiki_talk']['created_by']));?>, <?php echo smartDate($message['wiki_talk']['creation_date']);?> + </div> + <div class="message_view_description_hidden"> + <?php echo decodeWikiText($message['wiki_talk']['message']);?> + </div> + </div> + <div class="moderation_details_box"></div> + </div> + </div> + + + </div> + <?php } ?> <?php } ?> @@ -114,7 +154,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?redirect=".$this->controller."/".$this->action.$queryString;?>">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=".$currPos.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a> </div> <?php } ?> diff --git a/h-source/Application/Views/header.php b/h-source/Application/Views/header.php index 266d97a..8686221 100644 --- a/h-source/Application/Views/header.php +++ b/h-source/Application/Views/header.php @@ -24,6 +24,7 @@ $u = new UsersModel(); $hw = new HardwareModel(); $translations = array('insert'=>'inserted','update'=>'updated'); +$currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index'; ?> <head> diff --git a/h-source/Application/Views/right.php b/h-source/Application/Views/right.php index b931151..a6c7950 100644 --- a/h-source/Application/Views/right.php +++ b/h-source/Application/Views/right.php @@ -30,8 +30,6 @@ <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"> diff --git a/h-source/Application/Views/talk.php b/h-source/Application/Views/talk.php index a5de7d9..f578f8e 100644 --- a/h-source/Application/Views/talk.php +++ b/h-source/Application/Views/talk.php @@ -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?redirect=".$this->controller."/".$this->action.$queryString;?>">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=".$currPos.$queryString;?>">login</a> <?php echo gtext("in order to add a message");?></a> </div> <?php } ?>
\ No newline at end of file |