[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14681] more on bookingfrontend
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14681] more on bookingfrontend |
Date: |
Wed, 27 Jan 2016 10:34:12 +0000 |
Revision: 14681
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14681
Author: sigurdne
Date: 2016-01-27 10:34:11 +0000 (Wed, 27 Jan 2016)
Log Message:
-----------
more on bookingfrontend
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php
branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
branches/dev-syncromind/phpgwapi/templates/bkbooking/css/frontend.css
Modified: branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php
2016-01-27 07:43:30 UTC (rev 14680)
+++ branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php
2016-01-27 10:34:11 UTC (rev 14681)
@@ -13,6 +13,11 @@
{
parent::__construct();
self::set_active_menu('admin::bookingfrontend::metasettings');
+ $this->fields = array(
+ 'metatag_author' => 'string',
+ 'metatag_robots' => 'string',
+ 'frontpagetext' => 'html',
+ );
}
public function index()
@@ -22,11 +27,13 @@
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- foreach($_POST as $dim => $value)
+ $metasettings = extract_values($_POST,
$this->fields);
+
+ foreach($metasettings as $dim => $value)
{
if(strlen(trim($value)) > 0)
{
- $config->value($dim,
phpgw::clean_value($value));
+ $config->value($dim, $value);
}
else
{
Modified: branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
2016-01-27 07:43:30 UTC (rev 14680)
+++ branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
2016-01-27 10:34:11 UTC (rev 14681)
@@ -10,6 +10,15 @@
<xsl:value-of select="php:function('lang', 'please
wait')" />
</p>
</div>
+ <div class="pure-g">
+ <div class="pure-u-1" id="no_result">
+ <xsl:if test="not(search)">
+ <div id="cloud">
+ <xsl:value-of
disable-output-escaping="yes" select="frontpagetext"/>
+ </div>
+ </xsl:if>
+ </div>
+ </div>
<div id="content">
<form action="" method="GET" id="search">
<input type="hidden" id="menuaction" name="menuaction"
value="bookingfrontend.uisearch.index" />
@@ -51,28 +60,26 @@
<div class="heading">
<xsl:value-of
select="php:function('lang', 'Resource')" />
</div>
- <fieldset>
- <!-- Some style for the
expand/contract section-->
- <style>
- #expandcontractdiv
{border:1px dotted #dedede; margin:0 0 .5em 0; padding:0.4em;}
- #treeDiv1 { background:
#fff; padding:1em; margin-top:1em; }
-
.no_checkbox>i.jstree-checkbox{ display:none}
- </style>
- <script type="text/javascript">
- filter_tree =
<xsl:value-of select="filter_tree"/>;
- </script>
- <!-- markup for expand/contract
links -->
- <div id="treecontrol">
- <a id="collapse1"
title="Collapse the entire tree below" href="#">
- <xsl:value-of
select="php:function('lang', 'collapse all')"/>
- </a>
- <xsl:text> | </xsl:text>
- <a id="expand1"
title="Expand the entire tree below" href="#">
- <xsl:value-of
select="php:function('lang', 'expand all')"/>
- </a>
- </div>
- <div id="treeDiv1"></div>
- </fieldset>
+ <!-- Some style for the expand/contract
section-->
+ <style>
+ #expandcontractdiv {border:1px
dotted #dedede; margin:0 0 .5em 0; padding:0.4em;}
+ #treeDiv1 { background: #fff;
padding:1em; margin-top:1em; }
+ .no_checkbox>i.jstree-checkbox{
display:none}
+ </style>
+ <script type="text/javascript">
+ filter_tree = <xsl:value-of
select="filter_tree"/>;
+ </script>
+ <!-- markup for expand/contract links
-->
+ <div id="treecontrol">
+ <a id="collapse1"
title="Collapse the entire tree below" href="#">
+ <xsl:value-of
select="php:function('lang', 'collapse all')"/>
+ </a>
+ <xsl:text> | </xsl:text>
+ <a id="expand1" title="Expand
the entire tree below" href="#">
+ <xsl:value-of
select="php:function('lang', 'expand all')"/>
+ </a>
+ </div>
+ <div id="treeDiv1"></div>
</div>
<div class="pure-u-1">
<div class="heading">
@@ -185,7 +192,6 @@
<xsl:if test="not(search)">
<div id="cloud">
<div class="frontpagetext">
- <xsl:value-of
disable-output-escaping="yes" select="frontpagetext"/>
</div>
</div>
<div style="text-align:center;">
Modified: branches/dev-syncromind/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/bkbooking/css/frontend.css
2016-01-27 07:43:30 UTC (rev 14680)
+++ branches/dev-syncromind/phpgwapi/templates/bkbooking/css/frontend.css
2016-01-27 10:34:11 UTC (rev 14681)
@@ -186,6 +186,12 @@
margin: 3em 0;
font-size: 120%;
}
+
+/*#cloud{
+text-align:left;
+margin-left: 280px;
+}*/
+
#cloud div { padding: .2em};
#cloud strong { padding: .2em};
@@ -351,10 +357,6 @@
text-align:left;
}
-#cloud{
-text-align:left;
-margin-left: 280px;
-}
#footer{
border: none !important;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14681] more on bookingfrontend,
Sigurd Nes <=