R51198 - in /trunk: filemanager/templates/default/ filemanager/templates/pixelegg/ phpgwapi/inc/ phpgwapi/js/jsapi/

Old eGW-svn
1

Author: ralfbecker
New Revision: 51198

URL: http://svn.stylite.de/viewvc/egroupware?rev=51198&view=rev
Log:
using new mime icons for tile view in 64x64

Modified:
trunk/filemanager/templates/default/app.css
trunk/filemanager/templates/pixelegg/app.css
trunk/filemanager/templates/pixelegg/app.less
trunk/phpgwapi/inc/class.egw_vfs.inc.php
trunk/phpgwapi/inc/class.mime_magic.inc.php
trunk/phpgwapi/js/jsapi/egw_images.js

Modified: trunk/filemanager/templates/default/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/filemanager/templates/default/app.css?rev=51198&r1=51197&r2=51198&view=diff

— trunk/filemanager/templates/default/app.css (original)
+++ trunk/filemanager/templates/default/app.css Sun Jan 11 19:06:13 2015
@@ -77,7 +77,7 @@
table.egwGridView_grid .tile .file_tile img.vfsMimeIcon {
height: auto;
width: auto;

  • max-height: 120px;
  • max-height: 64px;
    display:block;
    margin: 0 auto;
    }

Modified: trunk/filemanager/templates/pixelegg/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/filemanager/templates/pixelegg/app.css?rev=51198&r1=51197&r2=51198&view=diff

— trunk/filemanager/templates/pixelegg/app.css (original)
+++ trunk/filemanager/templates/pixelegg/app.css Sun Jan 11 19:06:13 2015
@@ -1,6 +1,6 @@
/**

  • EGroupware: CSS with less preprocessor
    • FILEMANAGER
    • Please do NOT change app.css directly, instead change app.less and compile it!
      @@ -107,7 +107,7 @@
      table.egwGridView_grid .tile .file_tile img.vfsMimeIcon {
      height: auto;
      width: auto;
  • max-height: 120px;
  • max-height: 64px;
    display: block;
    margin: 0 auto;
    }

Modified: trunk/filemanager/templates/pixelegg/app.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/filemanager/templates/pixelegg/app.less?rev=51198&r1=51197&r2=51198&view=diff

— trunk/filemanager/templates/pixelegg/app.less (original)
+++ trunk/filemanager/templates/pixelegg/app.less Sun Jan 11 19:06:13 2015
@@ -1,6 +1,6 @@
/**

  • EGroupware: CSS with less preprocessor
    • FILEMANAGER
    • Please do NOT change app.css directly, instead change app.less and compile it!

Modified: trunk/phpgwapi/inc/class.egw_vfs.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.egw_vfs.inc.php?rev=51198&r1=51197&r2=51198&view=diff

— trunk/phpgwapi/inc/class.egw_vfs.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_vfs.inc.php Sun Jan 11 19:06:13 2015
@@ -1131,10 +1131,13 @@
$mime_full = strtolower(str_replace (’/’,’’,$mime_type));
list($mime_part) = explode(’’,$mime_full);

  •   if (!($img=$GLOBALS['egw']->common->image('etemplate',$icon='mime'.$size.'_'.$mime_full)) &&

  •   	!($img=$GLOBALS['egw']->common->image('etemplate',$icon='mime'.$size.'_'.$mime_part)))

  •   {

  •   	$img = $GLOBALS['egw']->common->image('etemplate',$icon='mime'.$size.'_unknown');

  •   if (!($img=common::image('etemplate',$icon='mime'.$size.'_'.$mime_full)) &&

  •   	// check mime-alias-map before falling back to more generic icons

  •   	!(isset(mime_magic::$mime_alias_map[$mime_type]) &&

  •   		($img=common::image('etemplate',$icon='mime'.$size.'_'.str_replace('/','_',self::$mime_alias_map[$mime_full])))) &&

  •   	!($img=common::image('etemplate',$icon='mime'.$size.'_'.$mime_part)))

  •   {

  •   	$img = common::image('etemplate',$icon='mime'.$size.'_unknown');
  }
  if ($et_image === 'url')
  {

@@ -1813,7 +1816,7 @@

	if ($mime_main == 'egw')
	{

  •   	$image = $GLOBALS['egw']->common->image($mime_sub, 'navbar');

  •   	$image = common::image($mime_sub, 'navbar');
  }
  else if ($file && $mime_main == 'image' && in_array($mime_sub, array('png','jpeg','jpg','gif','bmp')) &&
           (string)$GLOBALS['egw_info']['server']['link_list_thumbnail'] != '0' &&

Modified: trunk/phpgwapi/inc/class.mime_magic.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.mime_magic.inc.php?rev=51198&r1=51197&r2=51198&view=diff

— trunk/phpgwapi/inc/class.mime_magic.inc.php (original)
+++ trunk/phpgwapi/inc/class.mime_magic.inc.php Sun Jan 11 19:06:13 2015
@@ -1658,6 +1658,8 @@
);
/**
* Mapping some old formats to the newer form, or any other aliasing for mime-types

    • Should be in sync with …/js/jsapi/egw_image.js
      */
      static $mime_alias_map = array(
      ‘text/vcard’ => ‘text/x-vcard’,

Modified: trunk/phpgwapi/js/jsapi/egw_images.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/js/jsapi/egw_images.js?rev=51198&r1=51197&r2=51198&view=diff

— trunk/phpgwapi/js/jsapi/egw_images.js (original)
+++ trunk/phpgwapi/js/jsapi/egw_images.js Sun Jan 11 19:06:13 2015
@@ -24,6 +24,23 @@
* @access: private, use egw.image(_name, _app)
*/
var images = {};
+

  • /**

    • Mapping some old formats to the newer form, or any other aliasing for mime-types
    • Should be in sync with …/inc/class.mime_magic.inc.php

  • */

  • var mime_alias_map = {

  •   'text/vcard': 'text/x-vcard',

  •   'text/comma-separated-values': 'text/csv',

  •   'text/rtf': 'application/rtf',

  •   'text/xml': 'application/xml',

  •   'text/x-diff': 'text/diff',

  •   'application/x-jar': 'application/java-archive',

  •   'application/x-javascript': 'application/javascript',

  •   'application/x-troff': 'text/troff',

  •   'application/x-egroupware-etemplate': 'application/xml'

  • };

    return {
    /**
    @@ -99,12 +116,12 @@
    *
    * @param {string} _mime
    * @param {string} _path vfs path to generate thumbnails for images

  •    * @param {number} _size defaults to 16 (only supported size currently)

  •    * @param {number} _size defaults to 128 (only supported size currently)
   * @returns url of image
   */
  mime_icon: function(_mime, _path, _size)
  {

  •   	if (typeof _size == 'undefined') _size = 16;

  •   	if (typeof _size == 'undefined') _size = 128;
  	if (!_mime) _mime = 'unknown';
  	if (_mime == 'httpd/unix-directory') _mime = 'directory';

@@ -123,7 +140,8 @@
}
else
{

  •   		if ((typeof type[1] == 'undefined' || !(image = this.image('mime'+_size+'_'+type[0]+'_'+type[1], 'etemplate'))) &&

  •   		if ((typeof type[1] == 'undefined' || !(image = this.image('mime'+_size+'_'+type[0]+'_'+type[1], 'etemplate')) &&

  •   			!(typeof mime_alias_map[_mime] != 'undefined' && (image=this.mime_icon(mime_alias_map[_mime], _path, _size)))) &&
  			!(image = this.image('mime'+_size+'_'+type[0], 'etemplate')))
  		{
  			image = this.image('mime'+_size+'_unknown', 'etemplate');

Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net

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