From 41cce2d84fdff96f03ec068eb3e07eb1f565b49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= Date: Wed, 9 Jan 2013 11:48:17 -0500 Subject: [PATCH] WIP Rename edit-a-molecule files to be more consistent --- common/lib/capa/capa/inputtypes.py | 2 +- .../capa/capa/templates/edit-a-molecule.html | 33 --------------- .../capa/capa/templates/editamolecule.html | 3 +- .../JME.jar} | Bin common/static/css/capa/edit-a-molecule.css | 38 ------------------ .../{edit-a-molecule.js => editamolecule.js} | 0 6 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 common/lib/capa/capa/templates/edit-a-molecule.html rename common/static/applets/capa/{edit-a-molecule.jar => editamolecule/JME.jar} (100%) delete mode 100644 common/static/css/capa/edit-a-molecule.css rename common/static/js/capa/{edit-a-molecule.js => editamolecule.js} (100%) diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py index ca32bb0f28..91eace9fe3 100644 --- a/common/lib/capa/capa/inputtypes.py +++ b/common/lib/capa/capa/inputtypes.py @@ -857,7 +857,7 @@ class EditAMoleculeInput(InputTypeBase): """ """ context = { - 'applet_loader': '/static/js/capa/edit-a-molecule.js', + 'applet_loader': '/static/js/capa/editamolecule.js', } return context diff --git a/common/lib/capa/capa/templates/edit-a-molecule.html b/common/lib/capa/capa/templates/edit-a-molecule.html deleted file mode 100644 index b63fafefdb..0000000000 --- a/common/lib/capa/capa/templates/edit-a-molecule.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - Edit A Molecule - - - - - - - - - -

Edit A Molecule

-

The molecule Dopamine is shown below. Dopamine is a neurotransmitter.

- - - - - Applet failed to run. No Java plug-in was found. - - -
- - -

Edit the molecule to complete each one of the following the tasks. Click the check button to check your answer for that. Click submit when you are done.

- - - diff --git a/common/lib/capa/capa/templates/editamolecule.html b/common/lib/capa/capa/templates/editamolecule.html index b5b7fd3f8e..b32de66241 100644 --- a/common/lib/capa/capa/templates/editamolecule.html +++ b/common/lib/capa/capa/templates/editamolecule.html @@ -13,12 +13,13 @@ % endif - + Applet failed to run. No Java plug-in was found. +

diff --git a/common/static/applets/capa/edit-a-molecule.jar b/common/static/applets/capa/editamolecule/JME.jar similarity index 100% rename from common/static/applets/capa/edit-a-molecule.jar rename to common/static/applets/capa/editamolecule/JME.jar diff --git a/common/static/css/capa/edit-a-molecule.css b/common/static/css/capa/edit-a-molecule.css deleted file mode 100644 index b641b80408..0000000000 --- a/common/static/css/capa/edit-a-molecule.css +++ /dev/null @@ -1,38 +0,0 @@ -/** Add css rules here for your application. */ - - -/** Example rules used by the template application (remove for your app) */ -h1 { - font-size: 2em; - font-weight: bold; - color: #777777; - margin: 40px 0px 70px; -} - -.calculateButton { - display: block; - font-size: 16pt; -} - -.newMoleculeButton { - display: block; - font-size: 16pt; -} - -/** Most GWT widgets already have a style name defined */ -.gwt-DialogBox { - width: 400px; -} - -.dialogVPanel { - margin: 5px; -} - -.serverResponseLabelError { - color: red; -} - -/** Set ids using widget.getElement().setId("idOfElement") */ -#closeButton { - margin: 15px 6px 6px; -} diff --git a/common/static/js/capa/edit-a-molecule.js b/common/static/js/capa/editamolecule.js similarity index 100% rename from common/static/js/capa/edit-a-molecule.js rename to common/static/js/capa/editamolecule.js