aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--h-source/Application/Controllers/BaseController.php1
-rw-r--r--h-source/Application/Controllers/MeetController.php109
-rwxr-xr-xh-source/Application/Models/UsersModel.php18
-rw-r--r--h-source/Application/Views/Desktop/Meet/contributions.php11
-rw-r--r--h-source/Application/Views/Desktop/Meet/hardware.php36
-rw-r--r--h-source/Application/Views/Desktop/Meet/issues.php42
-rw-r--r--h-source/Application/Views/Desktop/Meet/list_template.php50
-rw-r--r--h-source/Application/Views/Desktop/Meet/messages.php41
-rw-r--r--h-source/Application/Views/Desktop/Meet/talk.php44
-rw-r--r--h-source/Application/Views/Desktop/Meet/wiki.php36
-rw-r--r--h-source/Application/Views/Desktop/Meet/wikitalk.php31
-rw-r--r--h-source/Application/Views/Mobile/header.php18
-rw-r--r--h-source/Config/Route.php1
-rw-r--r--h-source/Public/Css/mobile.css53
-rw-r--r--h-source/Public/Js/jquery/images/ajax-loader.pngbin0 -> 503 bytes
-rw-r--r--h-source/Public/Js/jquery/images/icon-search-black.pngbin0 -> 1245 bytes
-rw-r--r--h-source/Public/Js/jquery/images/icons-18-black.pngbin0 -> 2064 bytes
-rw-r--r--h-source/Public/Js/jquery/images/icons-18-white.pngbin0 -> 2200 bytes
-rw-r--r--h-source/Public/Js/jquery/images/icons-36-black.pngbin0 -> 3403 bytes
-rw-r--r--h-source/Public/Js/jquery/images/icons-36-white.pngbin0 -> 4020 bytes
20 files changed, 286 insertions, 205 deletions
diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php
index 260d6dc..69b47ac 100644
--- a/h-source/Application/Controllers/BaseController.php
+++ b/h-source/Application/Controllers/BaseController.php
@@ -54,6 +54,7 @@ class BaseController extends Controller
$this->model('BoxesModel');
$this->model('HistoryModel');
$this->model('ParamsModel');
+ $this->model('UsersModel');
$this->load('header');
$this->load('footer','last');
diff --git a/h-source/Application/Controllers/MeetController.php b/h-source/Application/Controllers/MeetController.php
index 5395a21..808b951 100644
--- a/h-source/Application/Controllers/MeetController.php
+++ b/h-source/Application/Controllers/MeetController.php
@@ -32,12 +32,12 @@ class MeetController extends BaseController
parent::__construct($model, $controller, $queryString);
$this->model('ProfileModel');
- $this->model('UsersModel');
$this->model('HardwareModel');
$this->model('IssuesModel');
$this->model('MessagesModel');
$this->model('TalkModel');
$this->model('WikiModel');
+ $this->model('WikitalkModel');
$argKeys = array(
'page:forceNat' => 1,
@@ -49,23 +49,6 @@ class MeetController extends BaseController
$this->append($data);
}
- //check if the users exists
- private function userExists($user)
- {
- $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : '';
-
- if (strcmp($clean['user'],'') !== 0)
- {
- $res = $this->m['UsersModel']->db->select('regusers','has_confirmed,deleted,username','username="'.$clean['user'].'" and has_confirmed=0 and deleted="no"');
-
- if (count($res) > 0)
- {
- return true;
- }
- }
- return false;
- }
-
//public page of the user
public function user($lang = 'en', $user = '')
{
@@ -74,7 +57,7 @@ class MeetController extends BaseController
$this->shift(2);
- if ($this->userExists($clean['user']))
+ if ($this->m['UsersModel']->userExists($clean['user']))
{
$clean['id_user'] = (int)$this->m['UsersModel']->getUserId($clean['user']);
$data['meet_id_user'] = $clean['id_user'];
@@ -106,7 +89,7 @@ class MeetController extends BaseController
$this->shift(2);
- if ($this->userExists($clean['user']))
+ if ($this->m['UsersModel']->userExists($clean['user']))
{
$clean['id_user'] = (int)$this->m['UsersModel']->getUserId($clean['user']);
@@ -120,15 +103,18 @@ class MeetController extends BaseController
$messNumb = $this->m['MessagesModel']->select('id_mes,messages.id_issue,messages.creation_date')->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->rowNumber();
- $talkNumb = $this->m['TalkModel']->select('talk.title')->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->rowNumber();
+ $talkNumb = $this->m['TalkModel']->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->rowNumber();
+
+ $wikiNumb = $this->m['WikiModel']->where($this->whereArray)->rowNumber();
- $wikiNumb = $this->m['WikiModel']->select()->where($this->whereArray)->rowNumber();
+ $wikiTalkNumb = $this->m['WikitalkModel']->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->rowNumber();
$data['hasHardware'] = $hardNumb > 0 ? true : false;
$data['hasIssues'] = $issuesNumb > 0 ? true : false;
$data['hasMessages'] = $messNumb > 0 ? true : false;
$data['hasTalk'] = $talkNumb > 0 ? true : false;
$data['hasWiki'] = $wikiNumb > 0 ? true : false;
+ $data['hasWikiTalk'] = $wikiTalkNumb > 0 ? true : false;
$this->append($data);
$this->load('contributions');
@@ -145,7 +131,7 @@ class MeetController extends BaseController
$this->shift(2);
- if ($this->userExists($clean['user']))
+ if ($this->m['UsersModel']->userExists($clean['user']))
{
$this->whereArray['username'] = $clean['user'];
@@ -153,8 +139,11 @@ class MeetController extends BaseController
$data['meet_username'] = $clean['user'];
+ $data['tree_last_string'] = "hardware contributions";
+ $data['page_explanation_title'] = "hardware contributions of";
+
$this->append($data);
- $this->load('hardware');
+ $this->load('list_template');
$this->right();
}
@@ -168,7 +157,7 @@ class MeetController extends BaseController
$this->shift(2);
- if ($this->userExists($clean['user']))
+ if ($this->m['UsersModel']->userExists($clean['user']))
{
//load the Pages helper
$this->helper('Pages','meet/issues/'.$this->lang.'/'.$clean['user'],'page');
@@ -188,8 +177,11 @@ class MeetController extends BaseController
$data['meet_username'] = $clean['user'];
+ $data['tree_last_string'] = "issues opened";
+ $data['page_explanation_title'] = "issues opened by";
+
$this->append($data);
- $this->load('issues');
+ $this->load('list_template');
$this->right();
}
@@ -203,7 +195,7 @@ class MeetController extends BaseController
$this->shift(2);
- if ($this->userExists($clean['user']))
+ if ($this->m['UsersModel']->userExists($clean['user']))
{
//load the Pages helper
$this->helper('Pages','meet/messages/'.$this->lang.'/'.$clean['user'],'page');
@@ -221,30 +213,33 @@ class MeetController extends BaseController
$data['meet_username'] = $clean['user'];
+ $data['tree_last_string'] = "messages submitted";
+ $data['page_explanation_title'] = "messages submitted by";
+
$data['pageList'] = $this->h['Pages']->render($page-3,7);
$this->append($data);
- $this->load('messages');
+ $this->load('list_template');
$this->right();
}
}
- //messages in the talk page
+ //messages in the talk page of the devices
public function talk($lang = 'en', $user = '')
{
$clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : '';
- $data['title'] = "messages submitted - ".Website::$generalName;
+ $data['title'] = "talk messages submitted - ".Website::$generalName;
$this->shift(2);
- if ($this->userExists($clean['user']))
+ if ($this->m['UsersModel']->userExists($clean['user']))
{
//load the Pages helper
$this->helper('Pages','meet/talk/'.$this->lang.'/'.$clean['user'],'page');
$clean['id_user'] = (int)$this->m['UsersModel']->getUserId($clean['user']);
- $this->m['TalkModel']->from('talk inner join hardware')->using('id_hard')->select('talk.title,talk.creation_date,talk.id_hard,talk.id_talk,hardware.type')->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->orderBy('id_talk desc');
+ $this->m['TalkModel']->inner('hardware')->using('id_hard')->select('talk.*,hardware.*')->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->orderBy('id_talk desc');
$recordNumber = $this->m['TalkModel']->rowNumber();
$page = $this->viewArgs['page'];
@@ -255,10 +250,13 @@ class MeetController extends BaseController
$data['meet_username'] = $clean['user'];
+ $data['tree_last_string'] = "talk messages (hardware pages)";
+ $data['page_explanation_title'] = "talk messages (hardware pages) submitted by";
+
$data['pageList'] = $this->h['Pages']->render($page-3,7);
$this->append($data);
- $this->load('talk');
+ $this->load('list_template');
$this->right();
}
}
@@ -271,7 +269,7 @@ class MeetController extends BaseController
$this->shift(2);
- if ($this->userExists($clean['user']))
+ if ($this->m['UsersModel']->userExists($clean['user']))
{
//load the Pages helper
$this->helper('Pages','meet/wiki/'.$this->lang.'/'.$clean['user'],'page');
@@ -289,13 +287,52 @@ class MeetController extends BaseController
$data['meet_username'] = $clean['user'];
+ $data['tree_last_string'] = "wiki contributions";
+ $data['page_explanation_title'] = "wiki contributions of";
+
$data['pageList'] = $this->h['Pages']->render($page-5,11);
$this->append($data);
- $this->load('wiki');
+ $this->load('list_template');
$this->right();
}
}
-
+
+ //messages in the talk page of the wiki pages
+ public function wikitalk($lang = 'en', $user = '')
+ {
+ $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : '';
+ $data['title'] = "talk messages submitted - ".Website::$generalName;
+
+ $this->shift(2);
+
+ if ($this->m['UsersModel']->userExists($clean['user']))
+ {
+ //load the Pages helper
+ $this->helper('Pages','meet/wikitalk/'.$this->lang.'/'.$clean['user'],'page');
+
+ $clean['id_user'] = (int)$this->m['UsersModel']->getUserId($clean['user']);
+
+ $this->m['WikitalkModel']->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->orderBy('id_talk desc');
+
+ $recordNumber = $this->m['WikitalkModel']->rowNumber();
+ $page = $this->viewArgs['page'];
+
+ $this->m['WikitalkModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,20);
+
+ $data['table'] = $this->m['WikitalkModel']->send();
+
+ $data['meet_username'] = $clean['user'];
+
+ $data['tree_last_string'] = "talk messages (wiki pages)";
+ $data['page_explanation_title'] = "talk messages (wiki pages) submitted by";
+
+ $data['pageList'] = $this->h['Pages']->render($page-3,7);
+
+ $this->append($data);
+ $this->load('list_template');
+ $this->right();
+ }
+ }
} \ No newline at end of file
diff --git a/h-source/Application/Models/UsersModel.php b/h-source/Application/Models/UsersModel.php
index 0d84bb4..ea19a7b 100755
--- a/h-source/Application/Models/UsersModel.php
+++ b/h-source/Application/Models/UsersModel.php
@@ -112,6 +112,24 @@ class UsersModel extends Model_Map
return $this->getLinkToUser($this->getUser($clean['id_user']));
}
+ //check if the user exists
+ public function userExists($user)
+ {
+ $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : '';
+
+ if (strcmp($clean['user'],'') !== 0)
+ {
+ $res = $this->where(array("username"=>$clean['user'],"has_confirmed"=>"0","deleted"=>"no"))->send();
+// $res = $this->db->select('regusers','has_confirmed','username="'.$clean['user'].'" and has_confirmed=0 and deleted="no"');
+
+ if (count($res) > 0)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
//get the user id from the username
public function getUserId($username = '')
{
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> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> &raquo; 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> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> &raquo; 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> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> &raquo; <?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> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> &raquo; 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> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> &raquo; 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> &raquo; <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> &raquo; <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> &raquo; 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
diff --git a/h-source/Application/Views/Mobile/header.php b/h-source/Application/Views/Mobile/header.php
index 474ff4a..1d109c8 100644
--- a/h-source/Application/Views/Mobile/header.php
+++ b/h-source/Application/Views/Mobile/header.php
@@ -35,16 +35,15 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index';
<meta name="keywords" content="hardware database free software GNU Linux distribution wiki users freedom" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
- <link rel="stylesheet" type="text/css" href="<?php echo $this->baseUrl?>/Public/Css/main.css">
- <link rel="Shortcut Icon" href="<?php echo $this->baseUrl?>/Public/Img/tab_icon_2.ico" type="image/x-icon">
-
-
<link rel="stylesheet" type="text/css" href="<?php echo $this->baseUrl;?>/Public/Js/jquery/jquery.mobile-1.0.css">
+ <link rel="stylesheet" type="text/css" href="<?php echo $this->baseUrl;?>/Public/Js/jquery/h-node-theme.css">
<script type="text/javascript" src="<?php echo $this->baseUrl;?>/Public/Js/jquery/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="<?php echo $this->baseUrl;?>/Public/Js/jquery/jquery.mobile-1.0.min.js"></script>
<script type="text/javascript" src="<?php echo $this->baseUrl;?>/Public/Js/functions.js"></script>
+ <link rel="stylesheet" type="text/css" href="<?php echo $this->baseUrl?>/Public/Css/mobile.css">
+
<script type="text/javascript">
var base_url = "<?php echo $this->baseUrl;?>";
@@ -63,7 +62,16 @@ $currPos = $querySanitized ? $this->controller."/".$this->action : 'home/index';
<body>
-<div data-role="page">
+<div data-role="page" data-theme="d">
<div data-role="header">
<img src="<?php echo $this->baseUrl;?>/Public/Img/title.png">
+
+ <div data-theme='b' data-role="navbar" data-iconpos="left">
+ <ul>
+ <li><a href="#" class="ui-btn-active">Home</a></li>
+ <li><a href="#">Hardware</a></li>
+ <li><a data-icon="gear" href="#">English</a></li>
+ </ul>
+ </div><!-- /navbar -->
+
</div>
diff --git a/h-source/Config/Route.php b/h-source/Config/Route.php
index e02afa3..4b12f1a 100644
--- a/h-source/Config/Route.php
+++ b/h-source/Config/Route.php
@@ -65,6 +65,7 @@ class Route
'meet,messages',
'meet,talk',
'meet,wiki',
+ 'meet,wikitalk',
'wifi,catalogue',
'wifi,view',
'wifi,history',
diff --git a/h-source/Public/Css/mobile.css b/h-source/Public/Css/mobile.css
new file mode 100644
index 0000000..55e470c
--- /dev/null
+++ b/h-source/Public/Css/mobile.css
@@ -0,0 +1,53 @@
+/*stili per il layout fisso*/
+html, body
+{
+ margin: 0;
+ padding:0;
+}
+
+body
+{
+ font:normal 15px/1.3 sans-serif,arial;
+ text-align: left;
+ background:#ffffff;
+}
+
+img
+{
+ border:0px;
+}
+
+.navigation-bar
+{
+ background-color: #015512;
+ height:35px;
+ padding-top:5px;
+ padding-right:5px;
+}
+
+/*tree navigation*/
+.position_tree_box
+{
+ margin:5px 0px 25px 0px;
+ padding:5px;
+ font:normal 14px/1 sans-serif,arial;
+ border-top:1px solid #DC143C;
+ border-bottom:1px solid #DC143C;
+}
+.position_tree_box a
+{
+ text-decoration:none;
+ color:#DC143C;
+}
+.last_tree_element
+{
+ font-weight:bold;
+}
+
+
+
+/*jquery mobile*/
+.ui-bar-a {
+ background: #B7F18C;
+}
+
diff --git a/h-source/Public/Js/jquery/images/ajax-loader.png b/h-source/Public/Js/jquery/images/ajax-loader.png
new file mode 100644
index 0000000..811a2cd
--- /dev/null
+++ b/h-source/Public/Js/jquery/images/ajax-loader.png
Binary files differ
diff --git a/h-source/Public/Js/jquery/images/icon-search-black.png b/h-source/Public/Js/jquery/images/icon-search-black.png
new file mode 100644
index 0000000..5721120
--- /dev/null
+++ b/h-source/Public/Js/jquery/images/icon-search-black.png
Binary files differ
diff --git a/h-source/Public/Js/jquery/images/icons-18-black.png b/h-source/Public/Js/jquery/images/icons-18-black.png
new file mode 100644
index 0000000..1ecfd26
--- /dev/null
+++ b/h-source/Public/Js/jquery/images/icons-18-black.png
Binary files differ
diff --git a/h-source/Public/Js/jquery/images/icons-18-white.png b/h-source/Public/Js/jquery/images/icons-18-white.png
new file mode 100644
index 0000000..0c70831
--- /dev/null
+++ b/h-source/Public/Js/jquery/images/icons-18-white.png
Binary files differ
diff --git a/h-source/Public/Js/jquery/images/icons-36-black.png b/h-source/Public/Js/jquery/images/icons-36-black.png
new file mode 100644
index 0000000..4c72adf
--- /dev/null
+++ b/h-source/Public/Js/jquery/images/icons-36-black.png
Binary files differ
diff --git a/h-source/Public/Js/jquery/images/icons-36-white.png b/h-source/Public/Js/jquery/images/icons-36-white.png
new file mode 100644
index 0000000..84ea9fb
--- /dev/null
+++ b/h-source/Public/Js/jquery/images/icons-36-white.png
Binary files differ