diff options
| author | Tony Anderson <tony@traveler.(none)> | 2011-01-18 10:22:08 (GMT) |
|---|---|---|
| committer | Tony Anderson <tony@traveler.(none)> | 2011-01-18 10:22:08 (GMT) |
| commit | 47ff762667a2601d423c7e6a75ddb96a7d3d5f9d (patch) | |
| tree | a0ef42fe690735195da5f68cba2ff240aaceba9d | |
| parent | ecb6a3857ba9782ebdb9e42269ba7eba3b3a8bd9 (diff) | |
version 11.10
| -rwxr-xr-x | activity/activity.info | 2 | ||||
| -rwxr-xr-x | content/css/global.css | 12 | ||||
| -rwxr-xr-x | contentedit.html | 44 |
3 files changed, 31 insertions, 27 deletions
diff --git a/activity/activity.info b/activity/activity.info index dd8e70b..0343a0a 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,5 +1,5 @@ [Activity] -#version = 11.9 +#version = 11.10 name = Learn service_name = org.olerwanda.Learn icon = activity-learn diff --git a/content/css/global.css b/content/css/global.css index a52342d..8560230 100755 --- a/content/css/global.css +++ b/content/css/global.css @@ -38,6 +38,18 @@ body { width:1200px;
height:748px;
}
+#editfs{
+ position:relative;
+ width:400px;
+ height:60px;
+ padding-top: 6px;
+ padding-left:15px;
+ font-size: 24pt;
+ font-weight: bold;
+ color: #FFFFFF;
+ border: none !important;
+ float: left;
+}
#topbtn_left {
float: left;
height: 60px;
diff --git a/contentedit.html b/contentedit.html index fd21d04..bf86435 100755 --- a/contentedit.html +++ b/contentedit.html @@ -11,10 +11,6 @@ <script type="text/javascript" src="tinymce/tiny_mce.js"></script> <script type="text/javascript"> -function editreturn(url) { - alert('return '+url); - window.location = url; -}; tinyMCE.init({ mode : "textareas", @@ -37,16 +33,13 @@ $(document).ready(function(){ parts.shift() openfile = parts[0]; $('#editreturn') - .click(editreturn(parts.join('?')+'X')) + .bind('click', function(){window.location = parts.join('?')+'X'}) items = openfile.split('/'); items.pop(); openfile = items.join('/') + '/source.txt'; $('#cntnt').load('http://localhost:8008/cgi-bin/fetchFile.py', - {'openfile':openfile}, - function(responseText, status, xhr) - { - ed.setContent(responseText); - }); + {'openfile':openfile} + ); }); function ajaxSave() { @@ -70,24 +63,23 @@ function toggleEditor(id) { </head> <body> <div id="header"> - <div id="topbtn_left"><div title="linkBack" id="editReturn" class="linkBack" /> - </div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> + <div id="topbtn_left"> + <div title="linkBack" id="editreturn" class="linkBack" /></div> + </div> + <div id="lesson_title"> + <img src="content/assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> Content Editor - <img src="../assets/image/title_block_rt.png" width="33" height="75" align="absmiddle" /> - </div> - <span style="font-size:24px; font-weight:bold"> - <fieldset> - <legend>Siyavula Content Editor</legend> - … - <a href="javascript:ajaxSave();">save</a> - <a href="javascript:toggleEditor('cntnt');">web/html</a> - </fieldset> - </span> - <div id="topbtn_right"> + <img src="content/assets/image/title_block_rt.png" width="33" height="75" align="absmiddle" /> + </div> + <div id = 'editfs'> + <fieldset style = "border:none"> + <a href="javascript:ajaxSave();">save</a> + <a href="javascript:toggleEditor('cntnt');">web/html</a> + </fieldset> + </div> + <div id="topbtn_right"> <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> + </div> </div> <div id="content"> <textarea id="cntnt" |