R52123 - in /branches/14.2: calendar/ calendar/inc/ etemplate/ etemplate/inc/

Author: hnategh
New Revision: 52123

URL: http://svn.stylite.de/viewvc/egroupware?rev=52123&view=rev
Log:
Change category icon in all apps

Modified:
branches/14.2/calendar/ (props changed)
branches/14.2/calendar/inc/class.calendar_ui.inc.php
branches/14.2/etemplate/ (props changed)
branches/14.2/etemplate/inc/class.nextmatch_widget.inc.php

Propchange: branches/14.2/calendar/

— svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 18:01:11 2015
@@ -1,2 +1,2 @@
/branches/Stylite-EPL-11.1/calendar:51445
-/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,52018,52020,52060,52085
+/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,52018,52020,52060,52085,52114

Modified: branches/14.2/calendar/inc/class.calendar_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_ui.inc.php?rev=52123&r1=52122&r2=52123&view=diff

— branches/14.2/calendar/inc/class.calendar_ui.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_ui.inc.php Thu Mar 12 18:01:11 2015
@@ -764,7 +764,7 @@
lang(‘Select a %1’,lang(‘Category’)). ‘"’.($cat_id && count($cat_id) > 1 ? ’ multiple=true size=4’:’’). ‘>’.
’’.lang(‘All categories’).’’.
$this->categories->formatted_list(‘select’,‘all’,$cat_id,‘True’).

  •   	"</select>\n" . html::image('phpgwapi','attach','','id="calendar_cat_id_multiple"')."
    
  •   	"</select>\n" . html::image('phpgwapi','category','','id="calendar_cat_id_multiple"')."
      	<script type=\"text/javascript\" src=\"{$GLOBALS['egw_info']['server']['webserver_url']}/calendar/js/navigation.js\" id=\"calendar-navigation-script\"".
      	" data-link-day-url =\"".htmlspecialchars($link['day']).
      	"\" data-link-week-url=\"".htmlspecialchars($link['week']).
    

Propchange: branches/14.2/etemplate/

— svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 18:01:11 2015
@@ -1,1 +1,1 @@
-/trunk/etemplate:51364,51378,51382,51385,51389,51391,51398,51405,51410,51412,51424-51425,51435,51437-51438,51450,51453-51454,51465,51488,51490,51516,51518,51522,51531,51533,51548,51551,51562,51565,51567,51580,51586-51589,51595,51600,51612,51628,51636,51645-51646,51649-51651,51680,51684,51690-51691,51695,51708,51712,51716-51717,51720,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907,51929,51933,51943,51948,51950-51951,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103
+/trunk/etemplate:51364,51378,51382,51385,51389,51391,51398,51405,51410,51412,51424-51425,51435,51437-51438,51450,51453-51454,51465,51488,51490,51516,51518,51522,51531,51533,51548,51551,51562,51565,51567,51580,51586-51589,51595,51600,51612,51628,51636,51645-51646,51649-51651,51680,51684,51690-51691,51695,51708,51712,51716-51717,51720,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907,51929,51933,51943,51948,51950-51951,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114

Modified: branches/14.2/etemplate/inc/class.nextmatch_widget.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/inc/class.nextmatch_widget.inc.php?rev=52123&r1=52122&r2=52123&view=diff

— branches/14.2/etemplate/inc/class.nextmatch_widget.inc.php (original)
+++ branches/14.2/etemplate/inc/class.nextmatch_widget.inc.php Thu Mar 12 18:01:11 2015
@@ -634,7 +634,7 @@
‘add’ => ‘new’,
‘new’ => ‘new’,
‘delete’ => ‘delete’,

  •   	'cat'  => 'attach',		// add as category icon to api
    
  •   	'cat'  => 'category',		// add as category icon to api
      	'document' => 'etemplate/merge',
      	'print'=> 'print',
      	'copy' => 'copy',
    

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