diff options
Diffstat (limited to 'h-source/Application/Views')
| -rw-r--r-- | h-source/Application/Views/Issues/view.php | 3 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/contributions.php | 56 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/hardware.php (renamed from h-source/Application/Views/Users/contributions.php) | 4 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/issues.php | 55 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/meet.php (renamed from h-source/Application/Views/Users/meet.php) | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/messages.php | 54 | ||||
| -rw-r--r-- | h-source/Application/Views/My/panel.php | 2 |
7 files changed, 171 insertions, 5 deletions
diff --git a/h-source/Application/Views/Issues/view.php b/h-source/Application/Views/Issues/view.php index ef5e39c..d15b3ce 100644 --- a/h-source/Application/Views/Issues/view.php +++ b/h-source/Application/Views/Issues/view.php @@ -98,7 +98,8 @@ <?php if (strcmp($row['messages']['deleted'],'no') === 0) { ?> - <div class="issues_message_item"> + + <a name="message-<?php echo $row['messages']['id_mes'];?>"></a><div class="issues_message_item"> <div class="issues_message_item_user"> <div class="issues_message_item_user_inner"> <?php echo $u->getUser($row['messages']['created_by']);?>: diff --git a/h-source/Application/Views/Meet/contributions.php b/h-source/Application/Views/Meet/contributions.php new file mode 100644 index 0000000..f679c71 --- /dev/null +++ b/h-source/Application/Views/Meet/contributions.php @@ -0,0 +1,56 @@ +<?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 program 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. +// +// This program 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 this program. 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."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » contributions + </div> + + <div class="contrib_explain_box"> + contributions of <?php echo $meet_username;?> + </div> + + <div class="external_users_contrib"> + + <!--hardware contributions--> + <?php if ($hasHardware) { ?> + <div class="user_hardware_pages"> + <a href="<?php echo $this->baseUrl."/meet/hardware/$lang/$meet_username";?>">hardware inserted/updated by <b><?php echo $meet_username;?></b></a> + </div> + <?php } ?> + + <!--issues opened--> + <?php if ($hasIssues) { ?> + <div class="user_hardware_pages"> + <a href="<?php echo $this->baseUrl."/meet/issues/$lang/$meet_username".$this->viewStatus;?>">issues opened by <b><?php echo $meet_username;?></b></a> + </div> + <?php } ?> + + <!--messages submitted--> + <?php if ($hasMessages) { ?> + <div class="user_hardware_pages"> + <a href="<?php echo $this->baseUrl."/meet/messages/$lang/$meet_username".$this->viewStatus;?>">messages submitted by <b><?php echo $meet_username;?></b></a> + </div> + <?php } ?> + + </div> + + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/Users/contributions.php b/h-source/Application/Views/Meet/hardware.php index 2d5995a..6cb2212 100644 --- a/h-source/Application/Views/Users/contributions.php +++ b/h-source/Application/Views/Meet/hardware.php @@ -21,11 +21,11 @@ <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."/users/meet/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » contributions + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> » hardware contributions </div> <div class="contrib_explain_box"> - contributions of <?php echo $meet_username;?> + hardware contributions of <?php echo $meet_username;?> </div> <div class="external_users_contrib"> diff --git a/h-source/Application/Views/Meet/issues.php b/h-source/Application/Views/Meet/issues.php new file mode 100644 index 0000000..c1315e1 --- /dev/null +++ b/h-source/Application/Views/Meet/issues.php @@ -0,0 +1,55 @@ +<?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 program 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. +// +// This program 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 this program. 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."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> » issues opened + </div> + + <div class="contrib_explain_box"> + issues opened by <?php echo $meet_username;?> + </div> + + <div class="external_users_contrib"> + <?php foreach ($table as $item) {?> + <div class="users_contrib_item"> + + <div class="contribution_item"> + <?php + + $i_date = $item['issues']['creation_date']; + $i_title = $item['issues']['title']; + $i_id = $item['issues']['id_issue']; + + ?> + + <?php echo "<a href='".$this->baseUrl."/issues/view/$lang/$i_id'>".$i_title."</a> at ".smartDate($i_date);?> + </div> + + </div> + <?php } ?> + </div> + + <div class="history_page_list"> + <?php echo gtext("page list");?>: <?php echo $pageList;?> + </div> + + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/Users/meet.php b/h-source/Application/Views/Meet/meet.php index ee0c708..35e106c 100644 --- a/h-source/Application/Views/Users/meet.php +++ b/h-source/Application/Views/Meet/meet.php @@ -25,7 +25,7 @@ </div> <div class="meet_contrib_link"> - <u>Public profile of <?php echo $meet_username;?></u>. See all <a href="<?php echo $this->baseUrl."/users/contributions/$lang/$meet_username";?>"><b><?php echo $meet_username;?></b> contributions</a> + <u>Public profile of <?php echo $meet_username;?></u>. See all <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>"><b><?php echo $meet_username;?></b> contributions</a> </div> <?php foreach ($table as $item) {?> diff --git a/h-source/Application/Views/Meet/messages.php b/h-source/Application/Views/Meet/messages.php new file mode 100644 index 0000000..6b4085f --- /dev/null +++ b/h-source/Application/Views/Meet/messages.php @@ -0,0 +1,54 @@ +<?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 program 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. +// +// This program 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 this program. 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."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> » messages submitted + </div> + + <div class="contrib_explain_box"> + messages submitted by <?php echo $meet_username;?> + </div> + + <div class="external_users_contrib"> + <?php foreach ($table as $item) {?> + <div class="users_contrib_item"> + + <div class="contribution_item"> + <?php + + $m_date = $item['messages']['creation_date']; + $m_id = $item['messages']['id_mes']; + $i_id = $item['messages']['id_issue']; + + ?> + + <?php echo "<a href='".$this->baseUrl."/issues/view/$lang/$i_id#message-$m_id'>".smartDate($m_date)."</a>";?> submitted to the issue <b><?php echo $item['issues']['title'];?></b> + </div> + + </div> + <?php } ?> + </div> + + <div class="history_page_list"> + <?php echo gtext("page list");?>: <?php echo $pageList;?> + </div> + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php index d03d274..1052462 100644 --- a/h-source/Application/Views/My/panel.php +++ b/h-source/Application/Views/My/panel.php @@ -25,7 +25,7 @@ </div> <ul class='panelApplicationList'> - <li><a href="<?php echo Url::getRoot('users/meet/'.$lang.'/'.$username);?>">Watch your public profile</a></li> + <li><a href="<?php echo Url::getRoot('meet/user/'.$lang.'/'.$username);?>">Watch your public profile</a></li> <li><a href="<?php echo Url::getRoot('my/profile/'.$lang.'/'.$token);?>">Edit your profile</a></li> <li><a href="<?php echo Url::getRoot('my/email/'.$lang.'/'.$token);?>">Change the e-mail address</a></li> <li><a href="<?php echo Url::getRoot('my/password/'.$lang.'/'.$token);?>">Change the password</a></li> |