Commits

Anonymous committed a493d38 Merge

merged changes from Luke

Comments (0)

Files changed (19)

semanticeditor/media/semanticeditor/wymeditor/iframe/default/arkestra-lbl-h3.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/arkestra-lbl-h4.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/arkestra-lbl-h5.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/arkestra-lbl-h6.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/arkestra-lbl-list.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/arkestra-lbl-p.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-blockquote.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-h1.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-h2.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-h3.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-h4.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-h5.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-h6.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-list.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-p.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/lbl-pre.png

Added
New image

semanticeditor/media/semanticeditor/wymeditor/iframe/default/wymiframe.css

+/*
+ * WYMeditor : what you see is What You Mean web-based editor
+ * Copyright (c) 2005 - 2009 Jean-Francois Hovinne, http://www.wymeditor.org/
+ * Dual licensed under the MIT (MIT-license.txt)
+ * and GPL (GPL-license.txt) licenses.
+ *
+ * For further information visit:
+ *        http://www.wymeditor.org/
+ * 
+ * File Name:
+ *        wymeditor.css
+ *        Main editor css file.
+ *        See the documentation for more info.
+ * 
+ * File Authors:
+ *        Jean-Francois Hovinne (jf.hovinne a-t wymeditor dotorg)
+ *        Daniel Reszka (d.reszka a-t wymeditor dotorg)
+*/
+
+/* VISUAL FEEDBACK */
+
+/* basic */
+  body  { background: #e1e8f1;}
+ 
+/* make HTML blocs visible */
+  p,
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  ul,
+  ol,
+  table,
+  blockquote,
+  pre           { background: #FFFFFF no-repeat center left;
+                  padding:8px 5px 5px;
+                  margin:10px; }
+  td            { background: #F0F4F8; }
+  th            { background: #ffffcc; }
+  ul,
+  ol            { border-left:20px solid #B9C4D0; padding:0px 5px; }
+  caption       { background: #E4E4B0; padding: 5px; font-weight: bold; }
+  table         { font-size: 12px; width: 500px; }
+  td            { width: 25%; }
+  blockquote    { margin-left: 30px; }
+  pre           { background-color:transparent; border: 1px solid white; }
+
+/* Gecko min height fix */
+  p             { min-height: 1em; } /*min-height is needed under Firefox, because empty parargraphs */
+  *+html p      { min-height: auto; } /* but we have to remove it under IE7 because it triggers the 'haslayout' mode */
+  td            { height: 1.6em; }
+ 
+/* labels 
+  p         { background-image: url(lbl-p.png); }
+  h1        { background-image: url(lbl-h1.png); }
+  h2        { background-image: url(lbl-h2.png); }
+  h3        { background-image: url(lbl-h3.png); }
+  h4        { background-image: url(lbl-h4.png); }
+  h5        { background-image: url(lbl-h5.png); }
+  h6        { background-image: url(lbl-h6.png); }
+  blockquote{ background-image: url(lbl-blockquote.png); }
+  pre       { background-image: url(lbl-pre.png); }
+
+*/
+/* specific HTML elements */
+  caption   { text-align: left; }
+  img       { margin-right: 5px;
+              border-style: solid;
+              border-color: gray;
+              border-width: 0; }
+  a img     { border-width: 1px; border-color: blue; }
+  acronym   { border: 1px solid gray; }
+  span      { background-color: #eef; }
+
+/* visual feedback for non-valid nesting of elements*/
+  h1 h1, h1 h2, h1 h3, h1 h4, h1 h5, h1 h6, h1 p, h1 pre, h1 address,
+  h2 h1, h2 h2, h2 h3, h2 h4, h2 h5, h2 h6, h2 p, h2 pre, h2 address,
+  h3 h1, h3 h2, h3 h3, h3 h4, h3 h5, h3 h6, h3 p, h3 pre, h3 address,
+  h4 h1, h4 h2, h4 h3, h4 h4, h4 h5, h4 h6, h4 p, h4 pre, h4 address,
+  h5 h1, h5 h2, h5 h3, h5 h4, h5 h5, h5 h6, h5 p, h5 pre, h5 address,
+  h6 h1, h6 h2, h6 h3, h6 h4, h6 h4, h6 h6, h6 p, h6 pre, h6 address,
+  p h1, p h2, p h3, p h4, p h5, p h6, p pre, p address,
+  pre h1, pre h2, pre h3, pre h4, pre h5, pre h6, pre p, pre pre, pre address,
+  address h1, address h2, address h3, address h4, address h5, address h6,
+  address p, address pre, address address
+  { background-color: #ff9999 !important;
+    border: 1px solid red !important;
+    font-size: 12px !important;
+    font-weight: normal; }
+
+/* amendments by Daniele to improve layout and appearance */
+
+
+  body  { 
+	background: #fee; /* pink as a warning not to paste */ 
+	color: black;
+	font-family: "Gill Sans", "Futura", "Bitstream Vera Sans", sans-serif;
+	margin: 0;}
+	
+/* labels */
+  p         { background-image: url(arkestra-lbl-p.png); }
+  h1        { background-image: url(arkestra-lbl-h1.png); }
+  h2        { background-image: url(lbl-h2.png); }
+  h3        { background-image: url(arkestra-lbl-h3.png); }
+  h4        { background-image: url(arkestra-lbl-h4.png); }
+  h5        { background-image: url(arkestra-lbl-h5.png); }
+  h6        { background-image: url(arkestra-lbl-h6.png); }
+  blockquote{ background-image: url(lbl-blockquote.png); }
+  pre       { background-image: url(lbl-pre.png); }
+	
+
+  p		{font-size: 100%;}
+  h1	{font-size: 155%;}
+  h2	{font-size: 140%;}
+  h3	{font-size: 125%;}
+  h4	{font-size: 110%;}
+  h5	{font-size: 95%;}
+  h6	{font-size: 80%;}
+  blockquote	{font-weight: light; color: #666;}
+
+  p,
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  ul,
+  ol,
+  table,
+  blockquote,
+  pre   {margin: 0; 
+      padding: .5em 0 .5em 2em;}
+
+  ol,ul	{border: none;
+		padding: 1em 2em;
+		background-image: url(arkestra-lbl-list.png);
+	  }
+
+  li	{margin-left: 1em; 
+	padding-left: 1em;
+	list-style-position: outside;}

semanticeditor/media/semanticeditor/wymeditor/iframe/default/wymiframe.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ * WYMeditor : what you see is What You Mean web-based editor
+ * Copyright (c) 2005 - 2009 Jean-Francois Hovinne, http://www.wymeditor.org/
+ * Dual licensed under the MIT (MIT-license.txt)
+ * and GPL (GPL-license.txt) licenses.
+ *
+ * For further information visit:
+ *        http://www.wymeditor.org/
+ *
+ * File Name:
+ *        wymiframe.html
+ *        Iframe used by designMode.
+ *        See the documentation for more info.
+ *
+ * File Authors:
+ *        Jean-Francois Hovinne (jf.hovinne a-t wymeditor dotorg)
+-->
+<html>
+<head>
+<title>WYMeditor iframe</title>
+<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+<link rel="stylesheet" type="text/css" media="screen" href="wymiframe.css" />
+</head>
+<body class="wym_iframe"></body>
+</html>

semanticeditor/templates/semanticeditor/editorwidget.html

         lang: '{{ language }}',
         skin: 'semanticeditor',
         skinPath: "{{ SEMANTICEDITOR_MEDIA_URL }}javascript/wymeditor/skins/semanticeditor/",
+        iframeBasePath: "{{ SEMANTICEDITOR_MEDIA_URL }}wymeditor/iframe/default/",
         updateSelector: '#text_form',
         updateEvent: 'submit',
 		logoHtml: '',