[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12238] more on menu, and some normalisation
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12238] more on menu, and some normalisation |
|
Date: |
Mon, 27 Oct 2014 20:27:45 +0000 |
Revision: 12238
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12238
Author: sigurdne
Date: 2014-10-27 20:27:44 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
more on menu, and some normalisation
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
branches/dev-syncromind/phpgwapi/templates/pure/css/demo_mmenu.css
branches/dev-syncromind/phpgwapi/templates/pure/footer.tpl
branches/dev-syncromind/phpgwapi/templates/pure/js/mmenu.js
branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php
Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2014-10-27 17:13:57 UTC (rev 12237)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2014-10-27 20:27:44 UTC (rev 12238)
@@ -17,7 +17,6 @@
<xsl:template match="data">
-<div id="main_content">
<xsl:choose>
<xsl:when test="datatable_name">
<h3>
@@ -26,11 +25,10 @@
</xsl:when>
</xsl:choose>
<xsl:call-template name="datatable" />
-</div>
</xsl:template>
-<xsl:template name="datatable" xmlns:php="http://php.net/xsl";>
+<xsl:template name="datatable">
<xsl:call-template name="jquery_phpgw_i18n"/>
<xsl:apply-templates select="form" />
<div id="list_flash">
@@ -43,7 +41,7 @@
<xsl:template match="toolbar">
- <style id='toggle-box-css' type='text/css'>
+ <style id='toggle-box-css' type='text/css' scoped='scoped'>
.toggle-box {
display: none;
}
Modified: branches/dev-syncromind/phpgwapi/templates/pure/css/demo_mmenu.css
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/css/demo_mmenu.css
2014-10-27 17:13:57 UTC (rev 12237)
+++ branches/dev-syncromind/phpgwapi/templates/pure/css/demo_mmenu.css
2014-10-27 20:27:44 UTC (rev 12238)
@@ -217,10 +217,14 @@
.topmenu li:hover > ul
{
display: block;
+ z-index: 5;
+
}
.topmenu ul.parent_hover
{
display: block;
+ z-index: 5;
+
}
@@ -269,6 +273,8 @@
{
top: 0;
left: 99%;
+ z-index: 5;
+
}
.topmenu li
@@ -277,7 +283,7 @@
}
.topmenu ul ul
{
- /* top: 0; --- remove this*/
+ top: 0;
margin-top: -1.2em;
left: 99%;
}
Modified: branches/dev-syncromind/phpgwapi/templates/pure/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/footer.tpl 2014-10-27
17:13:57 UTC (rev 12237)
+++ branches/dev-syncromind/phpgwapi/templates/pure/footer.tpl 2014-10-27
20:27:44 UTC (rev 12238)
@@ -1,3 +1,5 @@
+
+ </div>
<div class="footer">
<div class="button-bar">
{powered_by}
@@ -10,6 +12,6 @@
<div id="popupBox"></div>
<div id="curtain"></div>
</div>
- {javascript_end}
- </body>
+ {javascript_end}
+ </body>
</html>
\ No newline at end of file
Modified: branches/dev-syncromind/phpgwapi/templates/pure/js/mmenu.js
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/js/mmenu.js 2014-10-27
17:13:57 UTC (rev 12237)
+++ branches/dev-syncromind/phpgwapi/templates/pure/js/mmenu.js 2014-10-27
20:27:44 UTC (rev 12238)
@@ -48,7 +48,32 @@
);
}
);
+});
+$(document).ready(function(){
+
+ $('input[name="update_bookmark_menu"]').click( function( e ) {
+ e.preventDefault();
+ var id = $(this).attr('id');
+ var checked = $(this).is(':checked');
+ var oArgs = {menuaction:'phpgwapi.menu.update_bookmark_menu',
bookmark_candidate:$(this).val()};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl,
+ dataType: 'json',
+ success: function(data) {
+ if(data)
+ {
+ alert(data.status);
+ }
+ }
+ });
+ setTimeout(function() { $('#' + id).prop('checked',
checked); }, 1);
+ });
+
+
});
function update_bookmark_menu(bookmark_candidate){
Modified: branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php
2014-10-27 17:13:57 UTC (rev 12237)
+++ branches/dev-syncromind/phpgwapi/templates/pure/navbar.inc.php
2014-10-27 20:27:44 UTC (rev 12238)
@@ -38,6 +38,9 @@
<ul class="topmenu">
<li>
+ <a
href="{$logout_url}">{$logout_text}</a>
+ </li>
+ <li>
<a href="{$print_url}"
target="_blank">{$print_text}</a>
</li>
<li>
@@ -103,13 +106,6 @@
HTML;
}
- $var['topmenu'] .= <<<HTML
- <li>
- <a href="{$logout_url}">{$logout_text}</a>
- </li>
- </ul>
-HTML;
-
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
$GLOBALS['phpgw']->template->set_file('navbar', 'navbar.tpl');
@@ -183,6 +179,35 @@
{$treemenu}
</ul>
HTML;
+
+ $var['topmenu'] .= <<<HTML
+
+ <li>
+ <a href="#" >Bookmarks</a>
+ <ul>
+HTML;
+
+ $collected_bm = set_get_bookmarks();
+ foreach($collected_bm as $entry)
+ {
+ $var['topmenu'] .= <<<HTML
+
+ <li>
+ <a
href="{$entry['url']}">{$entry['text']}</a>
+ </li>
+
+HTML;
+
+ }
+ $var['topmenu'] .= <<<HTML
+
+ </ul>
+ </li>
+ </ul>
+HTML;
+
+
+
}
@@ -236,6 +261,7 @@
function render_item($item, $id='', $children='', $bookmarks = array())
{
+ static $checkbox_id = 1;
$current_class = '';
if ( $id ==
"navbar::{$GLOBALS['phpgw_info']['flags']['menu_selection']}" )
@@ -246,21 +272,20 @@
$bookmark = '';
if(preg_match("/(^navbar::)/i", $id)) // bookmarks
{
- // $_bookmark_candidate = $item;
- // $_bookmark_candidate['id'] = $id;
- // $_bookmark_candidate =
json_encode($_bookmark_candidate);
$_bookmark_checked = '';
if(is_array($bookmarks) && isset($bookmarks[$id]))
{
$_bookmark_checked = "checked = 'checked'";
+ set_get_bookmarks($item);
}
-// $bookmark = "<input type='checkbox'
name='bookmark_menu' value=''
onchange='javascript:update_bookmark_menu(\"{$id}\");' {$_bookmark_checked}/>";
+// $bookmark = "<input type='checkbox'
name='update_bookmark_menu' value='{$id}'
onchange='javascript:update_bookmark_menu(\"{$id}\");' {$_bookmark_checked}/>";
+ $bookmark = "<input type='checkbox'
name='update_bookmark_menu' id='{$checkbox_id}' value='{$id}'
{$_bookmark_checked}/>";
+ $checkbox_id ++;
}
if(preg_match("/(^{$id})/i",
"navbar::{$GLOBALS['phpgw_info']['flags']['menu_selection']}"))
{
-// $current_class = 'Selected';
$item['text'] = "<b>[ {$item['text']} ]</b>";
}
@@ -281,7 +306,7 @@
return <<<HTML
$out
- {$bookmark} <a href="{$item['url']}"
id="{$id}" {$target}>{$item['text']}</a>
+ <a href="{$item['url']}" id="{$id}"
{$target}>{$bookmark} {$item['text']}</a>
{$children}
</li>
@@ -378,3 +403,19 @@
}
uasort($navbar, 'sort_navbar');
}
+
+ /**
+ * Cheat function to collect bookmarks
+ * @staticvar array $bookmarks
+ * @param array $item
+ * @return array bookmarks
+ */
+ function set_get_bookmarks($item = array())
+ {
+ static $bookmarks = array();
+ if($item)
+ {
+ $bookmarks[] = $item;
+ }
+ return $bookmarks;
+ }
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12238] more on menu, and some normalisation,
Sigurd Nes <=