This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, feature/twig-template-engine has been updated
via d7cc8c08313727c6d04a21607f0a8506bde1455b (commit)
via ce9840077c99ecda75aff492b57f4b0b0ad1560b (commit)
via 620b3b411f30382191285befa6b923ec65fe1df9 (commit)
from 61e99dd63239f9d2acba9360c7e6f564e9827529 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d7cc8c08313727c6d04a21607f0a8506bde1455b
Author: Roland Mas <[email protected]>
Date: Fri Jun 12 15:45:51 2015 +0200
Added missing JS
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index 7553f5a..9d1ea11 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -188,6 +188,10 @@ class Theme_Funky_Twig extends Theme_Funky {
plugin_hook("javascript_file");
plugin_hook("css_file");
+ html_use_storage();
+ html_use_coolfieldset();
+ html_use_jqueryui();
+
$vars['javascripts'] = array();
foreach ($this->javascripts as $js) {
$vars['javascripts'][] = util_make_uri($js);
commit ce9840077c99ecda75aff492b57f4b0b0ad1560b
Author: Roland Mas <[email protected]>
Date: Fri Jun 12 14:33:47 2015 +0200
Implement searchbox in Twig (with required changes in Navigation)
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index cfdff3b..4b6b2fd 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -125,58 +125,78 @@ class Navigation extends Error {
}
}
- /**
- * Get the searchBox HTML code.
- */
- function getSearchBox() {
+ function getSearchBoxData() {
global $words, $forum_id, $group_id, $group_project_id, $atid,
$exact, $type_of_search;
- $res = "";
+ $vars = array();
+
+ $vars['search_url'] = util_make_uri('/search/');
if (get_magic_quotes_gpc()) {
$defaultWords = stripslashes($words);
} else {
$defaultWords = $words;
}
-
$defaultWords = htmlspecialchars($defaultWords);
-
- // if there is no search currently, set the default
if (!isset($type_of_search) ) {
$exact = 1;
}
-
- $res .= html_ao('form', array('id' => 'searchBox', 'action' =>
util_make_uri('/search/'), 'method' => 'get'));
- $res .= html_ao('div', array());
$parameters = array(
SEARCH__PARAMETER_GROUP_ID => $group_id,
SEARCH__PARAMETER_ARTIFACT_ID => $atid,
SEARCH__PARAMETER_FORUM_ID => $forum_id,
SEARCH__PARAMETER_GROUP_PROJECT_ID => $group_project_id
);
-
$searchManager =& getSearchManager();
$searchManager->setParametersValues($parameters);
- $searchEngines =& $searchManager->getAvailableSearchEngines();
+ $se = array();
+ foreach ($searchManager->getAvailableSearchEngines() as $e) {
+ $item = array('value' => $e->getType(),
+ 'name' =>
$e->getLabel($parameters));
+ if ($type_of_search == $e->getType()) {
+ $item['selected'] = true;
+ }
+ $se[] = $item;
+ }
+ $vars['search_engines'] = $se;
+
+ $vars['search_hidden_params'] = array();
+ foreach($searchManager->getParameters() as $name => $value) {
+ $vars['search_hidden_params'][] = array('value' =>
$value, 'name' => $name);
+ }
+ $vars['search_words'] = $defaultWords;
+ if (isset($group_id) && $group_id) {
+ $vars['advanced_search_url'] =
util_make_uri('/search/advanced_search.php?group_id='.$group_id);
+ }
+ return $vars;
+ }
+
+ /**
+ * Get the searchBox HTML code.
+ */
+ function getSearchBox() {
+ $vars = $this->getSearchBoxData();
+ $res = "";
+ $res .= html_ao('form', array('id' => 'searchBox', 'action' =>
$vars['search_url'], 'method' => 'get'));
+ $res .= html_ao('div', array());
$res .= html_ao('select', array('name' => 'type_of_search'));
- for($i = 0, $max = count($searchEngines); $i < $max; $i++) {
- $searchEngine =& $searchEngines[$i];
- $attrs = array('value' => $searchEngine->getType());
- if ( $type_of_search == $searchEngine->getType())
+ foreach ($vars['search_engines'] as $i) {
+ $attrs = array('value' => $i['value']);
+ if ($i['selected']) {
$attrs['selected'] = 'selected';
- $res .= html_e('option', $attrs,
$searchEngine->getLabel($parameters), false);
+ }
+ $res .= html_e('option', $attrs, $i['name'], false);
}
$res .= html_ac(html_ap() - 1);
- $parameters = $searchManager->getParameters();
- foreach($parameters AS $name => $value) {
- $res .= html_e('input', array('type' => 'hidden',
'value' => $value, 'name' => $name));
+ foreach($vars['search_hidden_params'] as $i) {
+ $res .= html_e('input', array('type' => 'hidden',
'value' => $i['value'], 'name' => $i['name']));
}
- $res .= html_e('input', array('type' => 'text', 'size' => 12,
'id' => 'searchBox-words', 'name' => 'words', 'value' => $defaultWords,
'required' => 'required'));
+ $res .= html_e('input', array('type' => 'text', 'size' => 12,
'id' => 'searchBox-words', 'name' => 'words', 'value' => $vars['search_words'],
'required' => 'required'));
$res .= html_e('input', array('type' => 'submit', 'name' =>
'Search', 'value' => _('Search')));
- if (isset($group_id) && $group_id) {
- $res .=
util_make_link('/search/advanced_search.php?group_id='.$group_id, _('Advanced
search'));
+ if (isset($vars['advanced_search_url'])) {
+ $res .= util_make_link($vars['advanced_search_url'],
_('Advanced search'));
}
$res .= html_ac(html_ap() - 2);
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index abba82f..7553f5a 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -255,6 +255,7 @@ class Theme_Funky_Twig extends Theme_Funky {
function bodyHeader($params){
$vars = array();
+ // General variables
if (isset($params['h1'])) {
$vars['h1'] = $params['h1'];
} elseif (isset($params['title'])) {
@@ -269,6 +270,7 @@ class Theme_Funky_Twig extends Theme_Funky {
$vars['title'] = forge_get_config('forge_name');
}
+ // User links (login, logout, my account, etc.)
$cells = array();
$cells[] = array('text' => util_make_link('/',
html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge
Home'))),
'attrs' => array('id' =>
'header-col1'));
@@ -287,15 +289,19 @@ class Theme_Funky_Twig extends Theme_Funky {
$vars['rowattrs'] = array();
$vars['siteheader_celldata'] = $cells;
+ // Search form
+ foreach ($this->navigation->getSearchBoxData() as $k => $v) {
+ $vars[$k] = $v;
+ }
+
+ // Quick navigation dropdown menu
if (session_loggedin()) {
$groups = session_get_user()->getGroups();
} else {
$groups = array();
}
sortProjectList($groups);
-
$naventries = array();
-
foreach ($groups as $g) {
$menu = $this->navigation->getProjectMenu($g->getID());
$naventries[] = array('url' => $menu['starturl'],
@@ -313,10 +319,9 @@ class Theme_Funky_Twig extends Theme_Funky {
}
}
}
-
$vars['naventries'] = $naventries;
-
+ // Outer tabs (site tabs)
$outertabsdata = array();
$menu = $this->navigation->getSiteMenu();
for ($i = 0; $i < count($menu['urls']); $i++) {
@@ -333,8 +338,7 @@ class Theme_Funky_Twig extends Theme_Funky {
}
$vars['outertabsdata'] = $outertabsdata;
-
-
+ // Inner tabs (project tabs)
$projecttabsdata = array();
if (isset($params['group']) && $params['group']) {
$menu =
$this->navigation->getProjectMenu($params['group'], $params['toptab']);
@@ -353,10 +357,12 @@ class Theme_Funky_Twig extends Theme_Funky {
}
$vars['projecttabsdata'] = $projecttabsdata;
+ // Feedback
$vars['error_msg'] = $GLOBALS['error_msg'];
$vars['warning_msg'] = $GLOBALS['warning_msg'];
$vars['feedback'] = $GLOBALS['feedback'];
+ // Project-specific submenu
$vars['submenu'] = $params['submenu'];
print $this->renderTemplate('bodyHeader.html', $vars);
@@ -434,10 +440,6 @@ class Theme_Funky_Twig extends Theme_Funky {
// TODO -- not used directly by pages, can be inlined in this
file (unless used in several places)
return parent::projectTabs($toptab, $group_id);
}
- function searchBox() {
- // TODO
- return parent::searchBox();
- }
function beginSubMenu() {
return $this->renderTemplate('beginSubMenu.html');
}
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html
b/src/www/themes/funky-twig/templates/bodyHeader.html
index c7b1873..79c5c35 100644
--- a/src/www/themes/funky-twig/templates/bodyHeader.html
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -1,51 +1,65 @@
{% include 'ListTableTop.html' with { 'class': 'fullwidth', 'id': 'header' }
only %}
- {% include 'multiTableRow.html' with { 'rowattrs': {}, 'cells':
siteheader_celldata } only %}
-
- {% if session_loggedin %}
-
-{% if naventries|length > 0 %}
-{% set indentarray = { 0: '', 1: ' ↳ ', 2: ' ↳ ' } %}
- <tr>
- <td id="header-line2" colspan="2">
-<form id="quicknavform" name="quicknavform" action="">
- <div>
- <select name="quicknav" id="quicknav"
onchange="location.href=document.quicknavform.quicknav.value">
- <option value="">Quick Jump To...</option>
- {% for e in naventries %}
- <option value="{{ e.url }}">{{ indentarray[e.indent]|raw }}{{ e.title
}}</option>
- {% endfor %}
- </select>
- </div>
- </form>
- </td>
- </tr>
+{% include 'multiTableRow.html' with { 'rowattrs': {}, 'cells':
siteheader_celldata } only %}
-{% endif %}
+<tr>
+ <td id="header-line2" colspan="2">
+
+ {% if session_loggedin and naventries|length > 0 %}
+ {% set indentarray = { 0: '', 1: ' ↳ ', 2: ' ↳ ' } %}
+ <form id="quicknavform" name="quicknavform" action="">
+ <div>
+ <select name="quicknav" id="quicknav"
onchange="location.href=document.quicknavform.quicknav.value">
+ <option value="">Quick Jump To...</option>
+ {% for e in naventries %}
+ <option value="{{ e.url }}">{{ indentarray[e.indent]|raw }}{{
e.title }}</option>
+ {% endfor %}
+ </select>
+ </div>
+ </form>
+ {% endif %}
-{% endif %}
+ <form id="searchBox" action="{{ search_url }}" method="get">
+ <div>
+ <select name="type_of_search">
+ {% for e in search_engines %}
+ <option value="{{ e.value }}">{{ e.name }}</option>
+ {% endfor %}
+ </select>
+ {% for h in search_hidden_params %}
+ <input type="hidden" value="{{ h.value }}" name="{{ h.name }}" />
+ {% endfor %}
+ <input type="text" size="12" id="searchBox-words" name="words"
value="{{ search_words }}" required="required" />
+ <input type="submit" name="Search" value="Search" />
+ {% if advanced_search_url %}
+ {% include 'Link.html' with { 'href': advanced_search_url, 'text':
'Advanced search' } only %}
+ {% endif %}
+ </div>
+ </form>
- {% include 'ListTableBottom.html' only %}
+ </td>
+</tr>
+
+{% include 'ListTableBottom.html' only %}
{% include 'Tabs.html' with { 'use_tooltips': use_tooltips, 'tabs':
outertabsdata, 'total_width': '100%' } only %}
- {% if projecttabsdata|length > 0 %}
- <div class="innertabs">
- {% include 'Tabs.html' with { 'use_tooltips': use_tooltips, 'tabs':
projecttabsdata, 'total_width': '100%', 'nested': true } only %}
- </div>
- {% endif %}
+{% if projecttabsdata|length > 0 %}
+<div class="innertabs">
+{% include 'Tabs.html' with { 'use_tooltips': use_tooltips, 'tabs':
projecttabsdata, 'total_width': '100%', 'nested': true } only %}
+</div>
+{% endif %}
-
- <div id="maindiv">
- {% include 'errorMessage.html' %}
- {% include 'warningMessage.html' %}
- {% include 'feedback.html' %}
+<div id="maindiv">
+ {% include 'errorMessage.html' %}
+ {% include 'warningMessage.html' %}
+ {% include 'feedback.html' %}
- {% if h1 %}
- <h1>{{ h1 }}</h1>
- {% else %}
- <h1 class="hide">{{ title }}</h1>
- {% endif %}
+ {% if h1 %}
+ <h1>{{ h1 }}</h1>
+ {% else %}
+ <h1 class="hide">{{ title }}</h1>
+ {% endif %}
- {{ submenu|raw }}
\ No newline at end of file
+ {{ submenu|raw }}
commit 620b3b411f30382191285befa6b923ec65fe1df9
Author: Roland Mas <[email protected]>
Date: Fri Jun 12 14:19:36 2015 +0200
Make Funky-Twig inherit from Funky
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index f0f7b52..abba82f 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once $gfwww.'include/Layout.class.php';
+require_once forge_get_config('themes_root').'/funky/Theme.class.php';
require_once 'Twig/Autoloader.php';
Twig_Autoloader::register();
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Navigation.class.php | 68 ++++++++++------
src/www/themes/funky-twig/Theme.class.php | 28 ++++---
.../themes/funky-twig/templates/bodyHeader.html | 92 +++++++++++++---------
3 files changed, 114 insertions(+), 74 deletions(-)
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index cfdff3b..4b6b2fd 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -125,58 +125,78 @@ class Navigation extends Error {
}
}
- /**
- * Get the searchBox HTML code.
- */
- function getSearchBox() {
+ function getSearchBoxData() {
global $words, $forum_id, $group_id, $group_project_id, $atid,
$exact, $type_of_search;
- $res = "";
+ $vars = array();
+
+ $vars['search_url'] = util_make_uri('/search/');
if (get_magic_quotes_gpc()) {
$defaultWords = stripslashes($words);
} else {
$defaultWords = $words;
}
-
$defaultWords = htmlspecialchars($defaultWords);
-
- // if there is no search currently, set the default
if (!isset($type_of_search) ) {
$exact = 1;
}
-
- $res .= html_ao('form', array('id' => 'searchBox', 'action' =>
util_make_uri('/search/'), 'method' => 'get'));
- $res .= html_ao('div', array());
$parameters = array(
SEARCH__PARAMETER_GROUP_ID => $group_id,
SEARCH__PARAMETER_ARTIFACT_ID => $atid,
SEARCH__PARAMETER_FORUM_ID => $forum_id,
SEARCH__PARAMETER_GROUP_PROJECT_ID => $group_project_id
);
-
$searchManager =& getSearchManager();
$searchManager->setParametersValues($parameters);
- $searchEngines =& $searchManager->getAvailableSearchEngines();
+ $se = array();
+ foreach ($searchManager->getAvailableSearchEngines() as $e) {
+ $item = array('value' => $e->getType(),
+ 'name' =>
$e->getLabel($parameters));
+ if ($type_of_search == $e->getType()) {
+ $item['selected'] = true;
+ }
+ $se[] = $item;
+ }
+ $vars['search_engines'] = $se;
+
+ $vars['search_hidden_params'] = array();
+ foreach($searchManager->getParameters() as $name => $value) {
+ $vars['search_hidden_params'][] = array('value' =>
$value, 'name' => $name);
+ }
+ $vars['search_words'] = $defaultWords;
+ if (isset($group_id) && $group_id) {
+ $vars['advanced_search_url'] =
util_make_uri('/search/advanced_search.php?group_id='.$group_id);
+ }
+ return $vars;
+ }
+
+ /**
+ * Get the searchBox HTML code.
+ */
+ function getSearchBox() {
+ $vars = $this->getSearchBoxData();
+ $res = "";
+ $res .= html_ao('form', array('id' => 'searchBox', 'action' =>
$vars['search_url'], 'method' => 'get'));
+ $res .= html_ao('div', array());
$res .= html_ao('select', array('name' => 'type_of_search'));
- for($i = 0, $max = count($searchEngines); $i < $max; $i++) {
- $searchEngine =& $searchEngines[$i];
- $attrs = array('value' => $searchEngine->getType());
- if ( $type_of_search == $searchEngine->getType())
+ foreach ($vars['search_engines'] as $i) {
+ $attrs = array('value' => $i['value']);
+ if ($i['selected']) {
$attrs['selected'] = 'selected';
- $res .= html_e('option', $attrs,
$searchEngine->getLabel($parameters), false);
+ }
+ $res .= html_e('option', $attrs, $i['name'], false);
}
$res .= html_ac(html_ap() - 1);
- $parameters = $searchManager->getParameters();
- foreach($parameters AS $name => $value) {
- $res .= html_e('input', array('type' => 'hidden',
'value' => $value, 'name' => $name));
+ foreach($vars['search_hidden_params'] as $i) {
+ $res .= html_e('input', array('type' => 'hidden',
'value' => $i['value'], 'name' => $i['name']));
}
- $res .= html_e('input', array('type' => 'text', 'size' => 12,
'id' => 'searchBox-words', 'name' => 'words', 'value' => $defaultWords,
'required' => 'required'));
+ $res .= html_e('input', array('type' => 'text', 'size' => 12,
'id' => 'searchBox-words', 'name' => 'words', 'value' => $vars['search_words'],
'required' => 'required'));
$res .= html_e('input', array('type' => 'submit', 'name' =>
'Search', 'value' => _('Search')));
- if (isset($group_id) && $group_id) {
- $res .=
util_make_link('/search/advanced_search.php?group_id='.$group_id, _('Advanced
search'));
+ if (isset($vars['advanced_search_url'])) {
+ $res .= util_make_link($vars['advanced_search_url'],
_('Advanced search'));
}
$res .= html_ac(html_ap() - 2);
diff --git a/src/www/themes/funky-twig/Theme.class.php
b/src/www/themes/funky-twig/Theme.class.php
index f0f7b52..9d1ea11 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once $gfwww.'include/Layout.class.php';
+require_once forge_get_config('themes_root').'/funky/Theme.class.php';
require_once 'Twig/Autoloader.php';
Twig_Autoloader::register();
@@ -188,6 +188,10 @@ class Theme_Funky_Twig extends Theme_Funky {
plugin_hook("javascript_file");
plugin_hook("css_file");
+ html_use_storage();
+ html_use_coolfieldset();
+ html_use_jqueryui();
+
$vars['javascripts'] = array();
foreach ($this->javascripts as $js) {
$vars['javascripts'][] = util_make_uri($js);
@@ -255,6 +259,7 @@ class Theme_Funky_Twig extends Theme_Funky {
function bodyHeader($params){
$vars = array();
+ // General variables
if (isset($params['h1'])) {
$vars['h1'] = $params['h1'];
} elseif (isset($params['title'])) {
@@ -269,6 +274,7 @@ class Theme_Funky_Twig extends Theme_Funky {
$vars['title'] = forge_get_config('forge_name');
}
+ // User links (login, logout, my account, etc.)
$cells = array();
$cells[] = array('text' => util_make_link('/',
html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge
Home'))),
'attrs' => array('id' =>
'header-col1'));
@@ -287,15 +293,19 @@ class Theme_Funky_Twig extends Theme_Funky {
$vars['rowattrs'] = array();
$vars['siteheader_celldata'] = $cells;
+ // Search form
+ foreach ($this->navigation->getSearchBoxData() as $k => $v) {
+ $vars[$k] = $v;
+ }
+
+ // Quick navigation dropdown menu
if (session_loggedin()) {
$groups = session_get_user()->getGroups();
} else {
$groups = array();
}
sortProjectList($groups);
-
$naventries = array();
-
foreach ($groups as $g) {
$menu = $this->navigation->getProjectMenu($g->getID());
$naventries[] = array('url' => $menu['starturl'],
@@ -313,10 +323,9 @@ class Theme_Funky_Twig extends Theme_Funky {
}
}
}
-
$vars['naventries'] = $naventries;
-
+ // Outer tabs (site tabs)
$outertabsdata = array();
$menu = $this->navigation->getSiteMenu();
for ($i = 0; $i < count($menu['urls']); $i++) {
@@ -333,8 +342,7 @@ class Theme_Funky_Twig extends Theme_Funky {
}
$vars['outertabsdata'] = $outertabsdata;
-
-
+ // Inner tabs (project tabs)
$projecttabsdata = array();
if (isset($params['group']) && $params['group']) {
$menu =
$this->navigation->getProjectMenu($params['group'], $params['toptab']);
@@ -353,10 +361,12 @@ class Theme_Funky_Twig extends Theme_Funky {
}
$vars['projecttabsdata'] = $projecttabsdata;
+ // Feedback
$vars['error_msg'] = $GLOBALS['error_msg'];
$vars['warning_msg'] = $GLOBALS['warning_msg'];
$vars['feedback'] = $GLOBALS['feedback'];
+ // Project-specific submenu
$vars['submenu'] = $params['submenu'];
print $this->renderTemplate('bodyHeader.html', $vars);
@@ -434,10 +444,6 @@ class Theme_Funky_Twig extends Theme_Funky {
// TODO -- not used directly by pages, can be inlined in this
file (unless used in several places)
return parent::projectTabs($toptab, $group_id);
}
- function searchBox() {
- // TODO
- return parent::searchBox();
- }
function beginSubMenu() {
return $this->renderTemplate('beginSubMenu.html');
}
diff --git a/src/www/themes/funky-twig/templates/bodyHeader.html
b/src/www/themes/funky-twig/templates/bodyHeader.html
index c7b1873..79c5c35 100644
--- a/src/www/themes/funky-twig/templates/bodyHeader.html
+++ b/src/www/themes/funky-twig/templates/bodyHeader.html
@@ -1,51 +1,65 @@
{% include 'ListTableTop.html' with { 'class': 'fullwidth', 'id': 'header' }
only %}
- {% include 'multiTableRow.html' with { 'rowattrs': {}, 'cells':
siteheader_celldata } only %}
-
- {% if session_loggedin %}
-
-{% if naventries|length > 0 %}
-{% set indentarray = { 0: '', 1: ' ↳ ', 2: ' ↳ ' } %}
- <tr>
- <td id="header-line2" colspan="2">
-<form id="quicknavform" name="quicknavform" action="">
- <div>
- <select name="quicknav" id="quicknav"
onchange="location.href=document.quicknavform.quicknav.value">
- <option value="">Quick Jump To...</option>
- {% for e in naventries %}
- <option value="{{ e.url }}">{{ indentarray[e.indent]|raw }}{{ e.title
}}</option>
- {% endfor %}
- </select>
- </div>
- </form>
- </td>
- </tr>
+{% include 'multiTableRow.html' with { 'rowattrs': {}, 'cells':
siteheader_celldata } only %}
-{% endif %}
+<tr>
+ <td id="header-line2" colspan="2">
+
+ {% if session_loggedin and naventries|length > 0 %}
+ {% set indentarray = { 0: '', 1: ' ↳ ', 2: ' ↳ ' } %}
+ <form id="quicknavform" name="quicknavform" action="">
+ <div>
+ <select name="quicknav" id="quicknav"
onchange="location.href=document.quicknavform.quicknav.value">
+ <option value="">Quick Jump To...</option>
+ {% for e in naventries %}
+ <option value="{{ e.url }}">{{ indentarray[e.indent]|raw }}{{
e.title }}</option>
+ {% endfor %}
+ </select>
+ </div>
+ </form>
+ {% endif %}
-{% endif %}
+ <form id="searchBox" action="{{ search_url }}" method="get">
+ <div>
+ <select name="type_of_search">
+ {% for e in search_engines %}
+ <option value="{{ e.value }}">{{ e.name }}</option>
+ {% endfor %}
+ </select>
+ {% for h in search_hidden_params %}
+ <input type="hidden" value="{{ h.value }}" name="{{ h.name }}" />
+ {% endfor %}
+ <input type="text" size="12" id="searchBox-words" name="words"
value="{{ search_words }}" required="required" />
+ <input type="submit" name="Search" value="Search" />
+ {% if advanced_search_url %}
+ {% include 'Link.html' with { 'href': advanced_search_url, 'text':
'Advanced search' } only %}
+ {% endif %}
+ </div>
+ </form>
- {% include 'ListTableBottom.html' only %}
+ </td>
+</tr>
+
+{% include 'ListTableBottom.html' only %}
{% include 'Tabs.html' with { 'use_tooltips': use_tooltips, 'tabs':
outertabsdata, 'total_width': '100%' } only %}
- {% if projecttabsdata|length > 0 %}
- <div class="innertabs">
- {% include 'Tabs.html' with { 'use_tooltips': use_tooltips, 'tabs':
projecttabsdata, 'total_width': '100%', 'nested': true } only %}
- </div>
- {% endif %}
+{% if projecttabsdata|length > 0 %}
+<div class="innertabs">
+{% include 'Tabs.html' with { 'use_tooltips': use_tooltips, 'tabs':
projecttabsdata, 'total_width': '100%', 'nested': true } only %}
+</div>
+{% endif %}
-
- <div id="maindiv">
- {% include 'errorMessage.html' %}
- {% include 'warningMessage.html' %}
- {% include 'feedback.html' %}
+<div id="maindiv">
+ {% include 'errorMessage.html' %}
+ {% include 'warningMessage.html' %}
+ {% include 'feedback.html' %}
- {% if h1 %}
- <h1>{{ h1 }}</h1>
- {% else %}
- <h1 class="hide">{{ title }}</h1>
- {% endif %}
+ {% if h1 %}
+ <h1>{{ h1 }}</h1>
+ {% else %}
+ <h1 class="hide">{{ title }}</h1>
+ {% endif %}
- {{ submenu|raw }}
\ No newline at end of file
+ {{ submenu|raw }}
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
