Fix CSS issues (empty stylehseets) and bug with inserting images

author garvinhicking <garvinhicking>

Thu, 22 Nov 2007 10:07:00 +0000 (10:07 +0000)

committer garvinhicking <garvinhicking>

Thu, 22 Nov 2007 10:07:00 +0000 (10:07 +0000)
author garvinhicking <garvinhicking>
Thu, 22 Nov 2007 10:07:00 +0000 (10:07 +0000)
committer garvinhicking <garvinhicking>
Thu, 22 Nov 2007 10:07:00 +0000 (10:07 +0000)
diff --git a/serendipity_editor.js b/serendipity_editor.js

index b034053b49b3d75a5bb49cb049ef43683c0431c2..6a9b6d0b0ef5b14fb18606e01e07377edd82d44e 100644 (file)
--- a/serendipity_editor.js
+++ b/serendipity_editor.js
@@ -260,6 +260,7 @@ function noWysiwygAdd( str, textarea )
          eltarget = document.forms[0].elements[0];
      }
      
+    wrapSelection(eltarget, str, '');
      eltarget.focus();
  }
  
diff --git a/templates/default/admin/media_choose.tpl b/templates/default/admin/media_choose.tpl

index b580474e454873a79cdead2200c921bcbc32cdce..ee2cbd7478bb733217b67c82fb558d5fe5093dd6 100644 (file)
--- a/templates/default/admin/media_choose.tpl
+++ b/templates/default/admin/media_choose.tpl
@@ -2,9 +2,9 @@
      <head>
          <title>{$CONST.SERENDIPITY_ADMIN_SUITE}: {$CONST.SELECT_FILE}</title>
          <meta http-equiv="Content-Type" content="text/html; charset={$CONST.LANG_CHARSET}" />
-        <link rel="stylesheet" type="text/css" href="{$media.css}" />
-        <link rel="stylesheet" type="text/css" href="{$media.css_tree}" />
-        <link rel="stylesheet" type="text/css" href="{$media.css_imgedit}" />
+        {if $media.css}<link rel="stylesheet" type="text/css" href="{$media.css}" />{/if}
+        {if $media.css_tree}<link rel="stylesheet" type="text/css" href="{$media.css_tree}" />{/if}
+        {if $media.css_imgedit}<link rel="stylesheet" type="text/css" href="{$media.css_imgedit}" />{/if}
  
          {if $media.is_imgedit}
          <style type="text/css">
author	garvinhicking <garvinhicking>
	Thu, 22 Nov 2007 10:07:00 +0000 (10:07 +0000)
committer	garvinhicking <garvinhicking>
	Thu, 22 Nov 2007 10:07:00 +0000 (10:07 +0000)
serendipity_editor.js		patch \| blob \| history
templates/default/admin/media_choose.tpl		patch \| blob \| history