Merge pull request #679 from uccser/rsa-no-padding-refactor

Refactor rsa-no-padding interactive.
uccser · Jul 20, 2018 · ac14a10 · ac14a10
2 parents 12fe444 + efb53bb
commit ac14a10
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 53 deletions.
diff --git a/csfieldguide/interactives/content/en/interactives.yaml b/csfieldguide/interactives/content/en/interactives.yaml
@@ -97,7 +97,7 @@ rsa-jsencrypt:
 rsa-key-generator:
   name: rsa-key-generator (broken)
 rsa-no-padding:
-  name: rsa-no-padding (broken)
+  name: RSA No Padding
 run-length-encoding:
   name: Run Length Encoding
 searching-algorithms:

diff --git a/csfieldguide/static/interactives/rsa-no-padding/index.html b/csfieldguide/static/interactives/rsa-no-padding/index.html
diff --git a/csfieldguide/static/interactives/rsa-no-padding/js/rsa-jsencrypt-no-padding.js b/csfieldguide/static/interactives/rsa-no-padding/js/rsa-jsencrypt-no-padding.js
@@ -17,25 +17,25 @@ $(document).ready(function(){
         if (encrypted) {
           $('#interactive-rsa-no-padding-output-text').val(encrypted);
         } else {
-          $('#interactive-rsa-no-padding-output-text').val('Error in encryption!');
+          $('#interactive-rsa-no-padding-output-text').val(rsa_no_padding_il8n["error"]);
         }
       } else {
         crypt.setPrivateKey($('#interactive-rsa-no-padding-key').val());
         var decrypted = crypt.decrypt(input_text);
         if (decrypted) {
           $('#interactive-rsa-no-padding-output-text').val(decrypted);
         } else {
-          $('#interactive-rsa-no-padding-output-text').val('Error in decryption!');
+          $('#interactive-rsa-no-padding-output-text').val(rsa_no_padding_il8n["error"]);
         }
       }
     });
 });
 
 function setDecryptionText() {
-  $('#interactive-rsa-no-padding-mode').text('Decrypter');
-  $('#interactive-rsa-no-padding-process').text('Decrypt');
-  $('#interactive-rsa-no-padding-input-type').text('Cipher');
-  $('#interactive-rsa-no-padding-output-type').text('Plain');
+  $('#interactive-rsa-no-padding-mode').text(rsa_no_padding_il8n["decrypter"]);
+  $('#interactive-rsa-no-padding-process').text(rsa_no_padding_il8n["decrypt"]);
+  $('#interactive-rsa-no-padding-input-type').text(rsa_no_padding_il8n["cipher"]);
+  $('#interactive-rsa-no-padding-output-type').text(rsa_no_padding_il8n["plain"]);
 };
 
 // From jquerybyexample.net/2012/06/get-url-parameters-using-jquery.html

diff --git a/csfieldguide/templates/interactives/rsa-no-padding.html b/csfieldguide/templates/interactives/rsa-no-padding.html
@@ -0,0 +1,43 @@
+{% extends interactive_mode_template %}
+
+{% load i18n %}
+{% load static %}
+
+{% block html %}
+	<div class="container">
+    <div class="row" id="interactive-rsa-no-padding" data-iframe-height>
+      <div class="col-12">
+        <h3>{% trans 'RSA <span id="interactive-rsa-no-padding-mode">Encrypter</span>' %}</h3>
+
+        <h5>{% trans 'Key' %}</h5>
+        <textarea id="interactive-rsa-no-padding-key" class="form-control mb-3" rows="5"></textarea>
+
+        <h5>{% trans '<span id="interactive-rsa-no-padding-input-type">Plain</span> Text' %}</h5>
+        <textarea id="interactive-rsa-no-padding-input-text" class="form-control mb-1" rows="5"></textarea>
+
+        <button id="interactive-rsa-no-padding-process" class="btn btn-primary mb-3">{% trans 'Encrypt' %}</button>
+
+        <h5><span id="interactive-rsa-no-padding-output-type">{% trans 'Cipher</span> Text' %}</h5>
+        <textarea id="interactive-rsa-no-padding-output-text" class="form-control mb-3" rows="5"></textarea>
+      </div>
+    </div>
+  </div>
+{% endblock html %}
+
+{% block css %}
+  <link rel="stylesheet" href="{% static 'interactives/rsa-no-padding/css/rsa-no-padding.css' %}">
+{% endblock css %}
+
+{% block js %}
+	<script type="text/javascript">
+		var rsa_no_padding_il8n = {
+			"error": "{% trans 'Error in encryption!' %}",
+			"decrypter": "{% trans 'Decrypter' %}",
+			"decrypt": "{% trans 'Decrypt' %}",
+			"cipher": "{% trans 'Cipher' %}",
+			"plain": "{% trans 'Plain' %}"
+		}
+	</script>
+  <script type="text/javascript" src="{% static 'interactives/rsa-no-padding/js/rsa-jsencrypt-no-padding.js' %}"></script>
+  <script type="text/javascript" src="{% static 'interactives/rsa-no-padding/js/third-party/jsencrypt-no-padding.js' %}"></script>
+{% endblock js %}