light9 Changeset - 79c615718a2f

Changeset - 79c615718a2f

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Drew Perttula - 10 years ago 2015-06-08 09:28:55
drewp@bigasterisk.com

#status corner style. rm hardcoded show uri. fix 'add to current song' ajax path.
Ignore-this: e2da0be542cf51456c12a2bbe7f5bb5d

4 files changed with 8 insertions and 8 deletions:

bin/keyboardcomposer

bin/rdfdb

light9/subserver/effects.coffee

light9/web/style.css

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -624,17 +624,13 @@ if __name__ == "__main__": @@
     if 0: # needs fixing, or maybe it's obsolete because other progs can just patch the rdf graph
         import twisted.internet
         try:
             reactor.listenTCP(networking.keyboardComposer.port,
                               server.Site(LevelServerHttp(kc.name_to_subbox)))
         except twisted.internet.error.CannotListenError, e:
             log.warn("Can't (and won't!) start level server:")
             log.warn(e)
     root.protocol('WM_DELETE_WINDOW', reactor.stop)
     tksupport.install(root,ms=10)
 #    prof.watchPoint("/usr/lib/python2.4/site-packages/rdflib-2.3.3-py2.4-linux-i686.egg/rdflib/Graph.py", 615)
     prof.run(reactor.run, profile=None)

bin/rdfdb

➞

Show inline comments

@@ @@ -407,25 +407,25 @@ class NoExts(cyclone.web.StaticFileHandl @@
 if __name__ == "__main__":
     logging.basicConfig()
     log = logging.getLogger()
     parser = optparse.OptionParser()
     parser.add_option("-v", "--verbose", action="store_true",
                       help="logging.DEBUG")
     (options, args) = parser.parse_args()
     log.setLevel(logging.DEBUG if options.verbose else logging.INFO)
     db = Db(dirUriMap={os.environ['LIGHT9_SHOW'].rstrip('/') + '/':
-                       URIRef('http://light9.bigasterisk.com/show/dance2014/')})
+                       showconfig.showUri()})
     from twisted.python import log as twlog
     twlog.startLogging(sys.stdout)
     reactor.listenTCP(networking.rdfdb.port, cyclone.web.Application(handlers=[
         (r'/live', Live),
         (r'/graph', GraphResource),
         (r'/patches', Patches),
         (r'/graphClients', GraphClients),
         (r'/(.*)', NoExts,
          {"path" : "light9/rdfdb/web",

light9/subserver/effects.coffee

➞

Show inline comments

@@ @@ -20,25 +20,25 @@ class Model @@
     })
   subtermExprs: (chase) =>
+    [
       'chase(t, names=LABEL, ontime=0.5, offset=0.2)'.replace(/LABEL/g, chase.label)
+    ]
 model = new Model()
 model.addToCurrentSong = (e) ->
   $.ajax({
     type: 'POST'
-    url: '//localhost:8070/songEffects'
+    url: '/effectEval/songEffects'
     data: {drop: e.uri}
   })
 reconnectingWebSocket "../effectsUpdates", (msg) ->
   model.chases(msg.chases) if msg.chases?
   model.classes(msg.classes) if msg.classes?
 # this sort of works to stop clicks in <input> from following the
 # submaster hyperlink, but it may make certain clicks act wrong
 $(document).on('click', 'a', (ev) ->
   return false if ev.target.tagName == 'INPUT'
+)

light9/web/style.css

➞

Show inline comments

@@ @@ -18,26 +18,28 @@ ul { @@
 a {
     color: rgb(97, 97, 255);
+}
 input[type=text] {
     border: 1px inset rgb(177, 177, 177);
     background: rgb(230, 230, 230);
     padding: 3px;
+}
 #status {
     position: fixed;
     bottom: 10px;
     right: 10px;
     bottom: 0px;
     right: 0px;
     background: rgba(0, 0, 0, 0.47);
     padding-left: 6px;
+}
 .songs {
     -moz-column-width:205px;
     -webkit-column-width:205px;
+}
 .songs button {
     display: inline-block;
     width: 200px;
     height: 50px;
     text-align: left;
@@ @@ -118,24 +120,26 @@ button a { @@
+}
 /* ascoltami mini mode */
 @media (max-height: 600px) {
     .songs {
         -webkit-column-width: 9em;
+    }
     .songs button {
         font-size: initial;
         height: initial;
         width: 100%;
         margin: initial;
         border-width: 1px;
         margin-bottom: 2px;
+    }
     .num {
         font-size: initial;
         padding: initial;
+    }
     .commands button {
         padding: 5px;
+    }
+}
 /* subserver */
 .vari {

0 comments (0 inline, 0 general)