|
From: <al...@us...> - 2008-08-27 17:12:25
|
Revision: 652
http://sciret.svn.sourceforge.net/sciret/?rev=652&view=rev
Author: alpeb
Date: 2008-08-27 17:12:22 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
moved the Submit Question and Manage Questions buttons to the top
Modified Paths:
--------------
trunk/templates/footer.tpl
trunk/templates/header.tpl
trunk/views/MainView.php
trunk/views/View.php
Modified: trunk/templates/footer.tpl
===================================================================
--- trunk/templates/footer.tpl 2008-08-27 16:33:21 UTC (rev 651)
+++ trunk/templates/footer.tpl 2008-08-27 17:12:22 UTC (rev 652)
@@ -114,10 +114,6 @@
</li>
<!-- END unansweredQuestionsItem_block -->
</ul>
- <span class="button_green"><a href="{addQuestionHref}">[l]Submit Question[/l]</a></span><br />
- <!-- BEGIN manageQuestionsLink_block -->
- <span class="button_green"><a href="{manageQuestionsHref}">[l]Manage Questions[/l]</a></span>
- <!-- END manageQuestionsLink_block -->
</div>
<div class="panel_bottom"></div>
<!-- END unansweredQuestions_block -->
Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl 2008-08-27 16:33:21 UTC (rev 651)
+++ trunk/templates/header.tpl 2008-08-27 17:12:22 UTC (rev 652)
@@ -27,6 +27,12 @@
<span class="button_green"><a href="index.php?action=Logout">[l]Logout[/l]</a></span>
<!-- END logoutLink_block -->
</p>
+ <p>
+ <span class="button_light"><a href="{addQuestionHref}">[l]Submit Question[/l]</a></span>
+ <!-- BEGIN manageQuestionsLink_block -->
+ <span class="button_light"><a href="{manageQuestionsHref}">[l]Manage Questions[/l]</a></span>
+ <!-- END manageQuestionsLink_block -->
+ </p>
</div>
</div><!--end head-->
Modified: trunk/views/MainView.php
===================================================================
--- trunk/views/MainView.php 2008-08-27 16:33:21 UTC (rev 651)
+++ trunk/views/MainView.php 2008-08-27 17:12:22 UTC (rev 652)
@@ -56,14 +56,6 @@
$this->tpl->set_block('unansweredQuestionsItem_block', 'answerLink_block', 'answerLink');
- $this->tpl->set_block('unansweredQuestions_block', 'manageQuestionsLink_block', 'manageQuestionsLink');
- if (!$this->user->isAnonymous()) {
- $this->tpl->set_var('manageQuestionsHref', Library::getLink(array('view' => 'ManageQuestions')));
- $this->tpl->parse('manageQuestionsLink', 'manageQuestionsLink_block');
- } else {
- $this->tpl->set_var('manageQuestionsLink', '');
- }
-
if (!isset($_GET['sort'])) {
$_GET['sort'] = 'created_desc';
}
@@ -73,7 +65,6 @@
'viewAllLink' => Library::getLink(array('view' => 'MainView', 'set' => 'all')),
'viewArticlesLink' => Library::getLink(array('view' => 'MainView', 'set' => 'articles')),
'viewBookmarksLink' => Library::getLink(array('view' => 'MainView', 'set' => 'bookmarks')),
- 'addQuestionHref' => Library::getLink(array('view' => 'AddQuestion')),
'sortByDateLink' => Library::getLink(array('view' => 'MainView', 'sort' => 'created_'.($order == 'created' && $direction == 'desc'? 'asc' : 'desc'))),
'sortByViewsLink' => Library::getLink(array('view' => 'MainView', 'sort' => 'views_'.($order == 'views' && $direction == 'desc'? 'asc' : 'desc'))),
));
Modified: trunk/views/View.php
===================================================================
--- trunk/views/View.php 2008-08-27 16:33:21 UTC (rev 651)
+++ trunk/views/View.php 2008-08-27 17:12:22 UTC (rev 652)
@@ -72,13 +72,20 @@
$this->tpl->set_block('header', 'loginLink_block', 'loginLink');
$this->tpl->set_block('header', 'welcome_block', 'welcome');
+ $this->tpl->set_block('header', 'manageQuestionsLink_block', 'manageQuestionsLink');
+
if ($this->user->isAnonymous()) {
$this->tpl->set_var('welcome', '');
$this->tpl->parse('loginLink', 'loginLink_block');
+
+ $this->tpl->set_var('manageQuestionsLink', '');
} else {
$this->tpl->set_var('loginLink', '');
$this->tpl->set_var('userFullName', $this->user->getFullName());
$this->tpl->parse('welcome', 'welcome_block');
+
+ $this->tpl->set_var('manageQuestionsHref', Library::getLink(array('view' => 'ManageQuestions')));
+ $this->tpl->parse('manageQuestionsLink', 'manageQuestionsLink_block');
}
$this->tpl->set_block('header', 'logoutLink_block', 'logoutLink');
@@ -91,6 +98,7 @@
$this->tpl->set_var(array(
'homeHref' => Library::getLink(),
'preferencesHref' => Library::getLink(array('view' => 'EditPreferences')),
+ 'addQuestionHref' => Library::getLink(array('view' => 'AddQuestion')),
));
$this->tpl->set_block('header', 'addArticleLink_block', 'addArticleLink');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|