Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Anderson <tony@traveler.(none)>2011-03-22 08:44:03 (GMT)
committer Tony Anderson <tony@traveler.(none)>2011-03-22 08:44:03 (GMT)
commite902434d4d649332fe80932159d7dd802e9b7be6 (patch)
treeba6c1f5c7f10effa25b0ca4f892c1010677f6cc3
parent41f7b6cafd883a3a0289c36fcaf582227cc6f1d3 (diff)
version 12.12
-rwxr-xr-xactivity/activity.info2
-rwxr-xr-xcontentedit.html33
2 files changed, 18 insertions, 17 deletions
diff --git a/activity/activity.info b/activity/activity.info
index 7145fa9..319c008 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,5 +1,5 @@
[Activity]
-#version = 12.11
+#version = 12.12
name = Learn
service_name = rw.olpc.Learn
icon = activity-learn
diff --git a/contentedit.html b/contentedit.html
index 5eb4616..4c69076 100755
--- a/contentedit.html
+++ b/contentedit.html
@@ -2,12 +2,11 @@
<html>
<head>
<title>Siyavula Content Editor</title>
-<link rel="stylesheet" href="css/screen.css" type="text/css" />
-<link rel="stylesheet" href="content/css/global.css" type="text/css"/>
-<script type="text/javascript" src="js/jquery-latest.js"></script>
-<script type="text/javascript" src="js/jquery.ui.all.js"</script>
-<script type="text/javascript" src="content/js/global.js"</script>
-<script type="text/javascript" src="content/js/navigation.js"</script>
+<link rel="stylesheet" href="content/karma/css/screen.css" type="text/css" />
+<link rel="stylesheet" href="content/karma/css/global.css" type="text/css"/>
+<script type="text/javascript" src="content/karma/js/external/jquery-1.4.2"></script>
+<script type="text/javascript" src="content/karma/js/external/jquery.ui.1.8.2.js"</script>
+<script type="text/javascript" src="content/karma/js/global.js"</script>
<script type="text/javascript" src="tinymce/tiny_mce.js"></script>
<script type="text/javascript">
@@ -26,17 +25,19 @@ tinyMCE.init({
height: "4000"
});
+host = 'http://localhost:8008/'
+url = window.location+"";
+parts = url.split('?');
+parts.shift()
+openfile = parts[0];
+items = openfile.split('/');
+items.pop();
+openfile = items.join('/') + '/source.txt';
+
$(document).ready(function(){
var ed = tinyMCE.get('cntnt');
- url = window.location+"";
- parts = url.split('?');
- parts.shift()
- openfile = parts[0];
$('#editreturn')
.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}
);
@@ -45,7 +46,7 @@ $(document).ready(function(){
function ajaxSave() {
var ed = tinyMCE.get('cntnt');
ed.setProgressState(1); // Show progress
- $('#cntnt').load('http://localhost:8008/cgi-bin/saveFile.py',
+ $('#cntnt').load('http:host+'cgi-bin/saveFile.py',
{'openfile':openfile, 'content':ed.getContent()},
function(responseText, status, xhr){
ed.setProgressState(0);
@@ -67,9 +68,9 @@ function toggleEditor(id) {
<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" />
+ <img src="content/karma/image/title_block_lt.png" width="33" height="75" align = "absmiddle" />
Content Editor
- <img src="content/assets/image/title_block_rt.png" width="33" height="75" align="absmiddle" />
+ <img src="content/karma/image/title_block_rt.png" width="33" height="75" align="absmiddle" />
</div>
<div id = 'editfs'>
<fieldset style = "border:none">