Changeset 3217

Timestamp:

2007-09-02 22:16:15 (1 year ago)

Author:

dcrowdy

Message:

Added keyboard shortcuts (and the ability to disable them); when adding a clip made playback start form that clip, and added a help page.

Files:

• arkaiv/trunk/arkaiv/controllers/page.py (modified) (5 diffs)
• arkaiv/trunk/arkaiv/controllers/page.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/model/__init__.py (modified) (1 diff)
• arkaiv/trunk/arkaiv/model/__init__.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/model/cmmlparser.py (modified) (1 diff)
• arkaiv/trunk/arkaiv/model/cmmlparser.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/templates/autohandler (modified) (2 diffs)
• arkaiv/trunk/arkaiv/templates/displayitem.mak (modified) (5 diffs)
• arkaiv/trunk/arkaiv/templates/help.mak (added)

arkaiv/trunk/arkaiv/controllers/page.py

@@ -219 +219 @@
-    def addclip(self):
-        clip = {}
-in
+floa
-        clip['itemid'] = request.params['itemid']
-        clip['a_text'] = request.params['a_text']
-request.params['id']
+clip['starttime'] # A kludge so users don't have to worry about providing ids
-        clip['a_href'] = request.params['a_href']
-        clip['desc'] = request.params['desc']
@@ -233 +233 @@
-        if has_video == "Yes":
-            clip['img_src'] = self.__createimageforclip(cmmlfile, clip)
-#            basename = os.path.splitext(cmmlfile)[0]
-#            imagedirname = basename + "_clipimages"
-#            clipimagename = str(clip['starttime']) + ".png"
-#            oggsource = model.getsourcepath(clip['itemid'])
-#            cwd = os.getcwd()
-#            os.chdir(imagedirname)  # ugly...
-#            frameimage = Frame(oggsource, clip['starttime'], clipimagename)    
-#            os.chdir(cwd)   # very ugly... #
-#
-#            # add that info to the dictionary - only needs to be a relative
-#            # location
-#
-#            relpath = os.path.split(imagedirname)[1]
-#            clip['img_src'] = relpath + "/" + clipimagename 
-
-        else:
@@ -258 +244 @@
-        parser = cmmlParser()
-        parser.addclipstocmmlfile(cmmlfile, cliplist)
-
+
+
-
-    def deleteclip(self):
@@ -532 +519 @@
-#        print cwd
-        os.chdir(imagedirname)  # ugly...
-in
+floa
-        print "after frameimage"
-        os.chdir(cwd)   # very ugly... #
@@ -543 +530 @@
-        return imagefile
-
+    def displayhelp(self):
+        return render('/help.mak')
+
+

arkaiv/trunk/arkaiv/model/__init__.py

@@ -512 +512 @@
-    new_clip = Clip()
-    new_clip.start_time = info['starttime']
-id
+starttime
-    new_clip.a_href = info['a_href']
-    new_clip.a_text = info['a_text']

arkaiv/trunk/arkaiv/model/cmmlparser.py

@@ -139 +139 @@
-        for clip in cliplist:
-            newclip = Etree.SubElement(root, 'clip')
-
+#
-            newclip.set('start', str(clip['start_time']))
-clip['id']
+str(clip['id'])
-            img = Etree.SubElement(newclip, 'img')
-            img.set('src', str(clip['img_src']))

arkaiv/trunk/arkaiv/templates/autohandler

@@ -6 +6 @@
-
-    </head>
-
+ onkeypress='keyPressed(event)'
-<p class="header">
-<h1>Arkaiv</h1>
@@ -13 +13 @@
-  <li>${ h.link_to("All Items", h.url(action="mainpage")) }</li>
-  <li>${ h.link_to("Collections", h.url(action="collections")) }</li>
-
+
+
-  <li><span class="searchpadding">
-${ h.form(h.url(action='search'), multipart=True) }

arkaiv/trunk/arkaiv/templates/displayitem.mak

@@ -1 +1 @@
-<%inherit file="/autohandler"/> 
-<div id="video">
+
-<p id="edititemname">${c.itemname}</p>
-<script type="text/javascript">
@@ -28 +29 @@
-<td><input type="text" name="gotofield" size="5"/></td>
-<td>(secs)</td>
+<td>Disable key shortcuts:</td>
+<td><input type="checkbox" name="shortcuts" value="toggle" onchange="toggleShortcuts()"></td>
-</tr>
-</table>
@@ -167 +170 @@
-
-Add new clip:
-
-
-
-
+
+
+
+
+
-  <td>${ h.text_field('starttime', size=5) }</td>
+    <td>Desc</td>
+  <td>
+  <input type="text" name="desc" size="20" onfocus="disableShortcuts()" onblur="enableShortcuts()" id="desc" />
+  <!--${ h.text_field('desc') }--></td>
+</tr>
+<tr>
-    <td>a_text</td>
-  <td>${ h.text_field('a_text') }</td>
-</tr>
-<tr>
-    <td>Id</td>
-  <td>${ h.text_field('id', size=5) }</td>
-    <td>a_href</td>
-  <td>${ h.text_field('a_href') }</td>
-</tr>
-<tr>
-    <td>img_src</td>
-  <td>${ h.text_field('img_src', size=5) }</td>
-    <td>desc</td>
-  <td>${ h.text_field('desc') }</td>
-</tr>
-</table>
-${ h.hidden_field('headindex', value = c.headdict['ixh']) }
-${ h.hidden_field('itemid', value=c.itemid) }
-${ h.hidden_field('hasvideo', value=c.sourcedict['has_video']) }
-
-${ h.submit('Add') } 
-${ h.end_form() } 
-
+
-<script>
-var plugin = document.embeds[0];
-var input  = document.api.ifield;
+var clipstart = document.addaclip.starttime;
-var goto  = document.api.gotofield;
-var output = document.api.ofield;
+var focusid = "enable";
+var shortcuts = document.api.shortcuts;
-
-function Play() {
-  plugin.play();
-!
+
-}
-
-function Pause() {
-  plugin.pause();
-!
+
-}
-
@@ -220 +222 @@
-function GetPlayPosition() {
-  addOutput("Play position: " + plugin.getPlayPosition() + " ms");
+}
+
+function PauseOrPlay(){
+        addOutput("current state: " + plugin.getCurrentState());
+        if (plugin.getCurrentState()==0) {Play();}
+        else {
+        if (plugin.getCurrentState()==1) Pause();}
-}
-
@@ -265 +274 @@
-    outLines--;
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</script>
-
+