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, master has been updated
via 350b46b6bf65bb4b08a71794e3d0d47619a38dc5 (commit)
via 89143866dcbf5cbccb8ab26a647d3f94a4b8eaee (commit)
via 512a014abcd4261b03595bdc53751cb4301c1e8e (commit)
from 92ce088d6fd6821308ad8d9c0223d7bb0ed618b0 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=350b46b6bf65bb4b08a71794e3d0d47619a38dc5
commit 350b46b6bf65bb4b08a71794e3d0d47619a38dc5
Author: Franck Villaume <[email protected]>
Date: Wed Sep 13 14:07:55 2017 +0000
apply selectmenu on visible items only
diff --git a/src/www/themes/funky/Theme.class.php
b/src/www/themes/funky/Theme.class.php
index ed1d94b..2d6fa82 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -75,7 +75,7 @@ class Theme_Funky extends Layout {
jQuery(":reset").button();
jQuery(":button").button();
jQuery("[id^=tabber").tabs();
-
jQuery("select").not(\'[multiple="multiple"]\').selectmenu({change: function(
event, ui ) {
+
jQuery("select").filter(":visible").not(\'[multiple="multiple"]\').selectmenu({change:
function( event, ui ) {
if
(ui.item.element.context.parentNode.id == "quicknav") {
location.href = ui.item.value;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=89143866dcbf5cbccb8ab26a647d3f94a4b8eaee
commit 89143866dcbf5cbccb8ab26a647d3f94a4b8eaee
Author: Franck Villaume <[email protected]>
Date: Wed Sep 13 13:38:09 2017 +0000
button alignment
diff --git a/src/www/tracker/reporting/index.php
b/src/www/tracker/reporting/index.php
index 6a96bf1..4bbe0b9 100644
--- a/src/www/tracker/reporting/index.php
+++ b/src/www/tracker/reporting/index.php
@@ -134,7 +134,7 @@ echo $HTML->openForm(array('action' =>
'/tracker/reporting/?group_id='.$group_id
<?php echo report_months_box($report, 'start', $start); ?></td>
<td><strong><?php echo _('End Date')._(': '); ?></strong><br />
<?php echo report_months_box($report, 'end', $end); ?></td>
-<td><input type="submit" name="submit" value="<?php echo _("Refresh") ?>"
/></td>
+<td><br /><input type="submit" name="submit" value="<?php echo _("Refresh")
?>" /></td>
</tr>
</table>
<?php
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=512a014abcd4261b03595bdc53751cb4301c1e8e
commit 512a014abcd4261b03595bdc53751cb4301c1e8e
Author: Franck Villaume <[email protected]>
Date: Wed Sep 13 13:34:24 2017 +0000
use jquery selectmenu widget
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 6bb7994..249458d 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -530,9 +530,8 @@ abstract class Layout extends FFError {
if (count($groups) < 1) {
return '';
} else {
- $result = $this->openForm(array('id' =>
'quicknavform', 'name' => 'quicknavform', 'action' => ''));
- $result .= html_ao('div');
- $result .= html_ao('select', array('name' =>
'quicknav', 'id' => 'quicknav', 'onchange' =>
'location.href=document.quicknavform.quicknav.value'));
+ $result .= html_ao('div', array('id' =>
'quicknavdiv'));
+ $result .= html_ao('select', array('name' =>
'quicknav', 'id' => 'quicknav', 'onchange' =>
'location.href=document.quicknavdiv.quicknav.value'));
$result .= html_e('option', array('value' =>
''), _('Quick Jump To...'), false);
if (!forge_get_config('use_quicknav_default')
&& session_get_user()->getPreference('quicknav_mode')) {
$groups =
session_get_user()->getActivityLogGroups();
@@ -550,7 +549,6 @@ abstract class Layout extends FFError {
}
}
$result .= html_ac(html_ap() - 2);
- $result .= $this->closeForm();
}
return $result;
}
@@ -1289,7 +1287,7 @@ abstract class Layout extends FFError {
$html_content .= sprintf(_('Displaying results %1$s out
of %2$d total.'), ($start + 1).'-'.$maxElements, $totalElements);
if (session_loggedin()) {
$html_content .= sprintf(' ' . _('Displaying %s
results.'), html_build_select_box_from_array(array('10', '25', '50', '100',
'1000'), 'nres', $paging, 1));
- $html_content .= $this->html_input('setpaging',
'', '', 'submit', _('Change'));
+ $html_content .= $this->html_input('setpaging',
'', '', 'submit', _('Change'), array(), array('style' => 'display:
inline-block'));
$html_content .= $this->closeForm();
}
}
diff --git a/src/www/themes/funky/Theme.class.php
b/src/www/themes/funky/Theme.class.php
index bbd5cdb..ed1d94b 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -75,6 +75,11 @@ class Theme_Funky extends Layout {
jQuery(":reset").button();
jQuery(":button").button();
jQuery("[id^=tabber").tabs();
+
jQuery("select").not(\'[multiple="multiple"]\').selectmenu({change: function(
event, ui ) {
+ if
(ui.item.element.context.parentNode.id == "quicknav") {
+
location.href = ui.item.value;
+ }
+ }});
});
//]]>'."\n";
if ($use_tooltips) {
diff --git a/src/www/themes/funky/css/theme.css
b/src/www/themes/funky/css/theme.css
index 0c3c754..3e54dbb 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -115,7 +115,6 @@ hr {
/* =header */
#header {
background: white url("../images/header/header-bg.png");
- font-size:77%;
margin: 0;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
@@ -180,8 +179,6 @@ hr {
.quicknews-toggle {
display: inline;
font-size: 12px;
-/* text-shadow: 1px 1px gray;*/
- color: white;
}
.quicknews .title {
@@ -229,8 +226,7 @@ hr {
#searchBox span {
- display: inline;
- margin-left: 20px;
+ margin-left: 20px;
}
#searchBox span input[type=text] {
@@ -250,18 +246,11 @@ hr {
display:none;
}
-/* =quicknavform */
-#quicknavform {
+#quicknavdiv {
display: inline;
- color: white;
float: left;
}
-#quicknavform span {
- display: inline;
- color: white;
-}
-
#quicknav {
margin-left: 7px;
width: 180px;
-----------------------------------------------------------------------
Summary of changes:
src/www/include/Layout.class.php | 8 +++-----
src/www/themes/funky/Theme.class.php | 5 +++++
src/www/themes/funky/css/theme.css | 15 ++-------------
src/www/tracker/reporting/index.php | 2 +-
4 files changed, 11 insertions(+), 19 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
