R55326 - in /trunk/bookmarks: inc/ lang/ templates/default/ templates/pixelegg/

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55326

URL: http://svn.stylite.de/viewvc/egroupware?rev=55326&view=rev
Log:
move [+ Add] button to left of NM header and fix not working display of favicons

Removed:
trunk/bookmarks/templates/pixelegg/app.css
trunk/bookmarks/templates/pixelegg/app.less
Modified:
trunk/bookmarks/inc/class.bookmarks_bo.inc.php
trunk/bookmarks/lang/ (props changed)
trunk/bookmarks/templates/default/app.css
trunk/bookmarks/templates/default/list.xet

Modified: trunk/bookmarks/inc/class.bookmarks_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/bookmarks/inc/class.bookmarks_bo.inc.php?rev=55326&r1=55325&r2=55326&view=diff

— trunk/bookmarks/inc/class.bookmarks_bo.inc.php (original)
+++ trunk/bookmarks/inc/class.bookmarks_bo.inc.php Wed Mar 9 12:33:33 2016
@@ -101,10 +101,9 @@
foreach($rows as $key => &$row) {
$favicon = egw_link::vfs_path(‘bookmarks’, $row[‘id’], ‘favicon.png’, true);

•   		//if(egw_vfs::is_dir(egw_link::vfs_path('bookmarks',$row['id'])) && egw_vfs::stat($favicon))
    		if(@egw_vfs::stat($favicon))
    		{
  

•   			$row['favicon'] = 'vfs:'.$favicon;
  

•   			$row['favicon'] = egw::link(egw_vfs::download_url($favicon));
    		}
  
    		$readonlys["edit[{$row['id']}]"] = !$this->check_perms2($row['owner'], $row['access'], EGW_ACL_READ) &&
  

@@ -182,7 +181,7 @@
{
if ($this->so->exists($values[‘url’]))
{

•   			$this->error_msg .= sprintf('<br>URL <B>%s</B> already exists!', $values['url']);
  

•   			$this->error_msg .= lang('URL "%1" already exists!', $values['url']);
    			return False;
    		}
    		$bm_id = $this->so->add($values);
  

Propchange: trunk/bookmarks/lang/

— svn:ignore (original)
+++ svn:ignore Wed Mar 9 12:33:33 2016
@@ -1,1 +1,5 @@
*.old
+.!12985!egw_tr.lang
+.!13000!egw_tr.lang
+.!13033!egw_tr.lang
+.!13571!egw_tr.lang

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

— trunk/bookmarks/templates/default/app.css (original)
+++ trunk/bookmarks/templates/default/app.css Wed Mar 9 12:33:33 2016
@@ -1,6 +1,6 @@
-.favicon, .favicon img {

• max-width: 24px;
• max-height: 24px;
  +#bookmarks-list_nm table.egwGridView_grid img.favicon {

• height: auto;
• max-height: 32px;
  }

#bookmarks-tree_add {

Modified: trunk/bookmarks/templates/default/list.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/bookmarks/templates/default/list.xet?rev=55326&r1=55325&r2=55326&view=diff

— trunk/bookmarks/templates/default/list.xet (original)
+++ trunk/bookmarks/templates/default/list.xet Wed Mar 9 12:33:33 2016
@@ -2,9 +2,6 @@

- - - @@ -29,11 +26,11 @@ - + - + @@ -41,7 +38,7 @@ - + @@ -58,7 +55,7 @@ - + @@ -69,17 +66,10 @@ + + + - - - - - - - - - - - +

---

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140

---

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