CkEditorConfig.php

hnategh-2 2016-04-06 16:45:32 UTC #1

Author: hnategh
New Revision: 55653

URL: http://svn.stylite.de/viewvc/egroupware?rev=55653&view=rev
Log:
Mobile theme W.I.P.:

Alway use flat skin for ckeditor regardless of preference
Add freetimesearch dialog

Added:
trunk/calendar/templates/mobile/freetimesearch.xet
- copied, changed from r55607, trunk/calendar/templates/default/freetimesearch.xet
Modified:
trunk/egroupware/api/src/Html/CkEditorConfig.php

Copied: trunk/calendar/templates/mobile/freetimesearch.xet (from r55607, trunk/calendar/templates/default/freetimesearch.xet)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/mobile/freetimesearch.xet?p2=trunk/calendar/templates/mobile/freetimesearch.xet&p1=trunk/calendar/templates/default/freetimesearch.xet&r1=55607&r2=55653&rev=55653&view=diff

— trunk/calendar/templates/default/freetimesearch.xet (original)
+++ trunk/calendar/templates/mobile/freetimesearch.xet Wed Apr 6 18:45:32 2016
@@ -29,18 +29,17 @@

```
  <grid>
```

  <grid border="1" width="100%">
  	<columns>

```
  		<column/>
```

  		<column width = "120"/>
  		<column/>
  	</columns>
  	<rows>

```
  		<row class="dialogHeader">
```

```
  		<row class="dialogHeadbar">
```
```
  		</row>
```

  		<row>
  			<description class="calendar_freetime_header" value="Freetime Search" span="all"/>

```
  		</row>
```
```
  		<row >
```

  			<description value="Startdate / -time"/>

  			<date-time id="start" statustext="Startdate and -time of the search"/>
  		</row>
  		<row>
  			<description value="Duration"/>

@@ -50,6 +49,24 @@

```
  		</row>
```
```
  		<row >
```

  			<description value="Startdate / -time"/>

  			<date-time id="start" statustext="Startdate and -time of the search"/>

```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```
```
  <grid>
```
```
  	<columns>
```
```
  		<column/>
```
```
  		<column/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row>
```

  		</row>
  		<row>
  			<description value="Timeframe"/>

Modified: trunk/egroupware/api/src/Html/CkEditorConfig.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Html/CkEditorConfig.php?rev=55653&r1=55652&r2=55653&view=diff

— trunk/egroupware/api/src/Html/CkEditorConfig.php (original)
+++ trunk/egroupware/api/src/Html/CkEditorConfig.php Wed Apr 6 18:45:32 2016
@@ -251,7 +251,7 @@
{
$skin = “moono”; //this is the basic skin for ckeditor
}

```
  	self::$skin = $skin;
```

  	self::$skin = \EGroupware\Api\Header\UserAgent::mobile()?'flat':$skin;
  }

  return self::$skin;

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs