diff options
Diffstat (limited to 'h-source/Application/Views/Desktop/Meet')
8 files changed, 127 insertions, 164 deletions
diff --git a/h-source/Application/Views/Desktop/Meet/contributions.php b/h-source/Application/Views/Desktop/Meet/contributions.php index 82921f7..43f56dd 100644 --- a/h-source/Application/Views/Desktop/Meet/contributions.php +++ b/h-source/Application/Views/Desktop/Meet/contributions.php @@ -39,10 +39,10 @@ </div> <?php } ?> - <!--talk messages submitted--> + <!--talk messages submitted (hardware pages)--> <?php if ($hasTalk) { ?> <div class="user_hardware_pages"> - <a href="<?php echo $this->baseUrl."/meet/talk/$lang/$meet_username".$this->viewStatus;?>">talk messages submitted by <b><?php echo $meet_username;?></b></a> + <a href="<?php echo $this->baseUrl."/meet/talk/$lang/$meet_username".$this->viewStatus;?>">talk messages submitted by <b><?php echo $meet_username;?></b> (hardware pages)</a> </div> <?php } ?> @@ -66,6 +66,13 @@ <a href="<?php echo $this->baseUrl."/meet/wiki/$lang/$meet_username".$this->viewStatus;?>">wiki pages inserted/updated by <b><?php echo $meet_username;?></b></a> </div> <?php } ?> + + <!--talk messages submitted (wiki pages)--> + <?php if ($hasWikiTalk) { ?> + <div class="user_hardware_pages"> + <a href="<?php echo $this->baseUrl."/meet/wikitalk/$lang/$meet_username".$this->viewStatus;?>">talk messages submitted by <b><?php echo $meet_username;?></b> (wiki pages)</a> + </div> + <?php } ?> </div> diff --git a/h-source/Application/Views/Desktop/Meet/hardware.php b/h-source/Application/Views/Desktop/Meet/hardware.php index 337c644..c8f5a7a 100644 --- a/h-source/Application/Views/Desktop/Meet/hardware.php +++ b/h-source/Application/Views/Desktop/Meet/hardware.php @@ -20,33 +20,11 @@ // 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."/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"> - hardware contributions of <?php echo $meet_username;?> - </div> - - <div class="external_users_contrib"> - <?php foreach ($table as $item) {?> - <div class="users_contrib_item"> + <?php - <div class="contribution_item"> - <?php - - $name = $item['hardware']['model']; - $type = $item['hardware']['type']; - $id_hard = $item['hardware']['id_hard']; - - ?> - <?php echo $type;?> <a href="<?php echo $this->baseUrl."/".MyStrings::$reverse[$type]."/view/$lang/$id_hard/".encodeUrl($name);?>"><?php echo $name;?></a> - </div> - - </div> - <?php } ?> - </div> - - </div>
\ No newline at end of file + $name = $item['hardware']['model']; + $type = $item['hardware']['type']; + $id_hard = $item['hardware']['id_hard']; + + ?> + <?php echo $type;?> <a href="<?php echo $this->baseUrl."/".MyStrings::$reverse[$type]."/view/$lang/$id_hard/".encodeUrl($name);?>"><?php echo $name;?></a>
\ No newline at end of file diff --git a/h-source/Application/Views/Desktop/Meet/issues.php b/h-source/Application/Views/Desktop/Meet/issues.php index 94bf8ed..2e88d5f 100644 --- a/h-source/Application/Views/Desktop/Meet/issues.php +++ b/h-source/Application/Views/Desktop/Meet/issues.php @@ -20,38 +20,12 @@ // 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."/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"> + <?php - <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 + $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);?>
\ No newline at end of file diff --git a/h-source/Application/Views/Desktop/Meet/list_template.php b/h-source/Application/Views/Desktop/Meet/list_template.php new file mode 100644 index 0000000..2c2f6d3 --- /dev/null +++ b/h-source/Application/Views/Desktop/Meet/list_template.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> » <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> » <?php echo $tree_last_string;?> + </div> + + <div class="contrib_explain_box"> + <?php echo $page_explanation_title;?> <?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 include(ROOT . '/Application/Views/' .$subfolder. "/Meet/".$this->action.".php");?> + </div> + + </div> + <?php } ?> + </div> + + <?php if (strcmp($this->action,'hardware') !== 0) {?> + <div class="history_page_list"> + <?php echo gtext("page list");?>: <?php echo $pageList;?> + </div> + <?php } ?> + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/Desktop/Meet/messages.php b/h-source/Application/Views/Desktop/Meet/messages.php index 82d2402..f85686b 100644 --- a/h-source/Application/Views/Desktop/Meet/messages.php +++ b/h-source/Application/Views/Desktop/Meet/messages.php @@ -20,37 +20,12 @@ // 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."/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"> + <?php - <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 + $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>
\ No newline at end of file diff --git a/h-source/Application/Views/Desktop/Meet/talk.php b/h-source/Application/Views/Desktop/Meet/talk.php index c6258d5..cd36c33 100644 --- a/h-source/Application/Views/Desktop/Meet/talk.php +++ b/h-source/Application/Views/Desktop/Meet/talk.php @@ -20,39 +20,13 @@ // 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."/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> » talk messages - </div> - - <div class="contrib_explain_box"> - talk messages submitted by <?php echo $meet_username;?> - </div> - - <div class="external_users_contrib"> - <?php foreach ($table as $item) {?> - <div class="users_contrib_item"> + <?php - <div class="contribution_item"> - <?php - - $t_date = $item['talk']['creation_date']; - $t_title = $item['talk']['title']; - $t_id = $item['talk']['id_hard']; - $t_id_talk = $item['talk']['id_talk']; - $controller = MyStrings::$reverse[$item['hardware']['type']]; - ?> - - <?php echo "<a href='".$this->baseUrl."/$controller/talk/$lang/$t_id#talk-$t_id_talk'>".$t_title."</a> at ".smartDate($t_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 + $t_date = $item['talk']['creation_date']; + $t_title = $item['talk']['title']; + $t_id = $item['talk']['id_hard']; + $t_id_talk = $item['talk']['id_talk']; + $controller = MyStrings::$reverse[$item['hardware']['type']]; + ?> + + <?php echo "<a href='".$this->baseUrl."/$controller/talk/$lang/$t_id#talk-$t_id_talk'>".$t_title."</a> at ".smartDate($t_date);?>
\ No newline at end of file diff --git a/h-source/Application/Views/Desktop/Meet/wiki.php b/h-source/Application/Views/Desktop/Meet/wiki.php index b813cda..1ec339e 100644 --- a/h-source/Application/Views/Desktop/Meet/wiki.php +++ b/h-source/Application/Views/Desktop/Meet/wiki.php @@ -20,36 +20,10 @@ // 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."/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> » wiki contributions - </div> - - <div class="contrib_explain_box"> - wiki contributions of <?php echo $meet_username;?> - </div> - - <div class="external_users_contrib"> - <?php foreach ($table as $item) {?> - <div class="users_contrib_item"> + <?php - <div class="contribution_item"> - <?php - - $name = $item['wiki']['title']; - $id_wiki = $item['wiki']['id_wiki']; - - ?> - <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($name);?>"><?php echo $name;?></a> - </div> - - </div> - <?php } ?> - </div> + $name = $item['wiki']['title']; + $id_wiki = $item['wiki']['id_wiki']; - <div class="history_page_list"> - <?php echo gtext("page list");?>: <?php echo $pageList;?> - </div> - - </div>
\ No newline at end of file + ?> + <a href="<?php echo $this->baseUrl."/wiki/page/$lang/".encodeUrl($name);?>"><?php echo $name;?></a>
\ No newline at end of file diff --git a/h-source/Application/Views/Desktop/Meet/wikitalk.php b/h-source/Application/Views/Desktop/Meet/wikitalk.php new file mode 100644 index 0000000..351960d --- /dev/null +++ b/h-source/Application/Views/Desktop/Meet/wikitalk.php @@ -0,0 +1,31 @@ +<?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/>. +?> + + <?php + + $t_date = $item['wiki_talk']['creation_date']; + $t_title = $item['wiki_talk']['title']; + $t_id = $item['wiki_talk']['id_wiki']; + $t_id_talk = $item['wiki_talk']['id_talk']; + ?> + + <?php echo "<a href='".$this->baseUrl."/wiki/talk/$lang/$t_id#wiki-talk-$t_id_talk'>".$t_title."</a> at ".smartDate($t_date);?>
\ No newline at end of file |