Moving themes into a themes folder (#287)

* Moving themes into a themes folder

This unifies themes under a themes folder which makes it easier to develop themes and install them.

CTFd/__init__.py

@@ -23,9 +23,11 @@ __version__ = '1.0.2'
 class ThemeLoader(FileSystemLoader):
     def get_source(self, environment, template):
         if template.startswith('admin/'):
+            template = template.lstrip('admin/')
+            template = "/".join(['admin', 'templates', template])
             return super(ThemeLoader, self).get_source(environment, template)
         theme = utils.get_config('ctf_theme')
-        template = "/".join([theme, template])
+        template = "/".join([theme, 'templates', template])
         return super(ThemeLoader, self).get_source(environment, template)
 
 
@@ -33,7 +35,7 @@ def create_app(config='CTFd.config.Config'):
     app = Flask(__name__)
     with app.app_context():
         app.config.from_object(config)
-        app.jinja_loader = ThemeLoader(os.path.join(app.root_path, app.template_folder), followlinks=True)
+        app.jinja_loader = ThemeLoader(os.path.join(app.root_path, 'themes'), followlinks=True)
 
         from CTFd.models import db, Teams, Solves, Challenges, WrongKeys, Keys, Tags, Files, Tracking
 

CTFd/themes/admin/static/js/chal-new.js

@@ -1,8 +1,8 @@
 function load_chal_template(chal_type_name){
-    $.get(script_root + '/static/admin/js/templates/challenges/'+ chal_type_name +'/' + chal_type_name + '-challenge-create.hbs', function(template_data){
+    $.get(script_root + '/themes/admin/static/js/templates/challenges/'+ chal_type_name +'/' + chal_type_name + '-challenge-create.hbs', function(template_data){
         var template = Handlebars.compile(template_data);
         $("#create-chal-entry-div").html(template({'nonce':nonce, 'script_root':script_root}));
-        $.getScript(script_root + '/static/admin/js/templates/challenges/'+chal_type_name+'/'+chal_type_name+'-challenge-create.js', function(){
+        $.getScript(script_root + '/themes/admin/static/js/templates/challenges/'+chal_type_name+'/'+chal_type_name+'-challenge-create.js', function(){
             console.log('loaded');
         });
     });

CTFd/themes/admin/static/js/chalboard.js

@@ -22,7 +22,7 @@ String.prototype.hashCode = function() {
 };
 
 function load_edit_key_modal(key_id, key_type_name) {
-    $.get(script_root + '/static/admin/js/templates/keys/'+key_type_name+'/edit-'+key_type_name+'-modal.hbs', function(template_data){
+    $.get(script_root + '/themes/admin/static/js/templates/keys/'+key_type_name+'/edit-'+key_type_name+'-modal.hbs', function(template_data){
         $.get(script_root + '/admin/keys/' + key_id, function(key_data){
             $('#edit-keys').empty();
             var template = Handlebars.compile(template_data);
@@ -43,11 +43,11 @@ function load_chal_template(id, success_cb){
     obj = $.grep(challenges['game'], function (e) {
         return e.id == id;
     })[0]
-    $.get(script_root + '/static/admin/js/templates/challenges/'+ obj['type_name'] +'/' + obj['type_name'] + '-challenge-update.hbs', function(template_data){
+    $.get(script_root + '/themes/admin/static/js/templates/challenges/'+ obj['type_name'] +'/' + obj['type_name'] + '-challenge-update.hbs', function(template_data){
         var template = Handlebars.compile(template_data);
         $("#update-modals-entry-div").html(template({'nonce':$('#nonce').val(), 'script_root':script_root}));
         $.ajax({
-          url: script_root + '/static/admin/js/templates/challenges/'+obj['type_name']+'/'+obj['type_name']+'-challenge-update.js',
+          url: script_root + '/themes/admin/static/js/templates/challenges/'+obj['type_name']+'/'+obj['type_name']+'-challenge-update.js',
           dataType: "script",
           success: success_cb,
           cache: true,

CTFd/themes/admin/static/js/templates/challenges/standard/standard-challenge-update.js

@@ -57,7 +57,7 @@ function loadkeys(chal){
         keys = $.parseJSON(JSON.stringify(data));
         keys = keys['keys'];
         $('#current-keys').empty();
-        $.get(script_root + "/static/admin/js/templates/admin-keys-table.hbs", function(data){
+        $.get(script_root + "/themes/admin/static/js/templates/admin-keys-table.hbs", function(data){
             var template = Handlebars.compile(data);
             var wrapper  = {keys: keys, script_root: script_root};
             $('#current-keys').append(template(wrapper));
@@ -317,7 +317,7 @@ $('#create-key').click(function(e){
 $('#create-keys-select').change(function(){
     var key_type_name = $(this).find("option:selected").text();
 
-    $.get(script_root + '/static/admin/js/templates/keys/'+key_type_name +'/'+key_type_name+'.hbs', function(template_data){
+    $.get(script_root + '/themes/admin/static/js/templates/keys/'+key_type_name +'/'+key_type_name+'.hbs', function(template_data){
         var template = Handlebars.compile(template_data);
         $("#create-keys-entry-div").html(template());
         $("#create-keys-button-div").show();

CTFd/themes/admin/templates/base.html

@@ -5,17 +5,17 @@
 		<title>Admin Panel</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<link rel="shortcut icon" href="{{ request.script_root }}/static/original/img/favicon.ico" type="image/x-icon">
-		<link rel="icon" href="{{ request.script_root }}/static/original/img/favicon.ico" type="image/x-icon">
-		<link rel="stylesheet" href="{{ request.script_root }}/static/admin/css/vendor/bootstrap.min.css">
-		<link rel="stylesheet" href="{{ request.script_root }}/static/admin/css/vendor/font-awesome/css/font-awesome.min.css" />
-		<link rel="stylesheet" href="{{ request.script_root }}/static/admin/css/style.css">
-		<link href='{{ request.script_root }}/static/admin/css/vendor/lato.css' rel='stylesheet' type='text/css'>
-		<link href='{{ request.script_root }}/static/admin/css/vendor/raleway.css' rel='stylesheet' type='text/css'>
-		<link rel="stylesheet" type="text/css" href="{{ request.script_root }}/static/admin/css/style.css">
-		<script src="{{ request.script_root }}/static/admin/js/vendor/moment.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/moment-timezone-with-data.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/handlebars.min.js"></script>
+		<link rel="shortcut icon" href="{{ request.script_root }}/themes/original/static/img/favicon.ico" type="image/x-icon">
+		<link rel="icon" href="{{ request.script_root }}/themes/original/static/img/favicon.ico" type="image/x-icon">
+		<link rel="stylesheet" href="{{ request.script_root }}/themes/admin/static/css/vendor/bootstrap.min.css">
+		<link rel="stylesheet" href="{{ request.script_root }}/themes/admin/static/css/vendor/font-awesome/css/font-awesome.min.css" />
+		<link rel="stylesheet" href="{{ request.script_root }}/themes/admin/static/css/style.css">
+		<link href='{{ request.script_root }}/themes/admin/static/css/vendor/lato.css' rel='stylesheet' type='text/css'>
+		<link href='{{ request.script_root }}/themes/admin/static/css/vendor/raleway.css' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" type="text/css" href="{{ request.script_root }}/themes/admin/static/css/style.css">
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/moment.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/moment-timezone-with-data.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/handlebars.min.js"></script>
 		<script type="text/javascript">
 				var script_root = "{{ request.script_root }}";
 		</script>
@@ -74,11 +74,11 @@
 				</div>
 		</div>
 	</div>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/jquery.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/marked.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/bootstrap.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/main.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/jquery.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/marked.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/bootstrap.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/main.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/utils.js"></script>
 		{% block scripts %} {% endblock %}
 </body>
 

CTFd/themes/admin/templates/chals.html

@@ -50,7 +50,7 @@
 {% endblock %}
 
 {% block scripts %}
-	<script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
-	<script src="{{ request.script_root }}/static/admin/js/chalboard.js"></script>
-	<script src="{{ request.script_root }}/static/admin/js/multi-modal.js"></script>
+	<script src="{{ request.script_root }}/themes/admin/static/js/utils.js"></script>
+	<script src="{{ request.script_root }}/themes/admin/static/js/chalboard.js"></script>
+	<script src="{{ request.script_root }}/themes/admin/static/js/multi-modal.js"></script>
 {% endblock %}

CTFd/themes/admin/templates/chals/create.html

@@ -31,15 +31,15 @@
 {% endblock %}
 
 {% block scripts %}
-	<script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
-	<script src="{{ request.script_root }}/static/admin/js/vendor/codemirror.min.js"></script>
+	<script src="{{ request.script_root }}/themes/admin/static/js/utils.js"></script>
+	<script src="{{ request.script_root }}/themes/admin/static/js/vendor/codemirror.min.js"></script>
 	<script>
 
 	function load_chal_template(chal_type_name){
-		$.get(script_root + '/static/admin/js/templates/challenges/'+ chal_type_name +'/' + chal_type_name + '-challenge-create.hbs', function(template_data){
+		$.get(script_root + '/themes/admin/static/js/templates/challenges/'+ chal_type_name +'/' + chal_type_name + '-challenge-create.hbs', function(template_data){
 			var template = Handlebars.compile(template_data);
 			$("#create-chal-entry-div").html(template({'nonce':nonce, 'script_root':script_root}));
-			$.getScript(script_root + '/static/admin/js/templates/challenges/'+chal_type_name+'/'+chal_type_name+'-challenge-create.js', function(){
+			$.getScript(script_root + '/themes/admin/static/js/templates/challenges/'+chal_type_name+'/'+chal_type_name+'-challenge-create.js', function(){
 				console.log('loaded');
 			});
 		});

CTFd/themes/admin/templates/correct_keys.html

@@ -77,7 +77,7 @@
 {% endblock %}
 
 {% block scripts %}
-	<script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
+	<script src="{{ request.script_root }}/themes/admin/static/js/utils.js"></script>
 	<script>
 	$('#delete-solve').click(function(e){
 		e.preventDefault();

CTFd/themes/admin/templates/editor.html

@@ -1,7 +1,7 @@
 {% extends "admin/base.html" %}
 
 {% block stylesheets %}
-	<link rel="stylesheet" type="text/css" href="{{ request.script_root }}/static/admin/css/vendor/codemirror.min.css">
+	<link rel="stylesheet" type="text/css" href="{{ request.script_root }}/themes/admin/static/css/vendor/codemirror.min.css">
 	<style>
 	.row-fluid { margin: 25px; padding-bottom: 25px; }
 	.media-item-wrapper { height: 120px; margin: 5px;
@@ -129,8 +129,8 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
-<script src="{{ request.script_root }}/static/admin/js/vendor/codemirror.min.js"></script>
+<script src="{{ request.script_root }}/themes/admin/static/js/utils.js"></script>
+<script src="{{ request.script_root }}/themes/admin/static/js/vendor/codemirror.min.js"></script>
 <script>
 	function uploadfiles(){
 		var form = $('#media-library-upload')[0];

CTFd/themes/admin/templates/graphs.html

@@ -29,7 +29,7 @@
 			display: block;
 		}
 	</style>
-	<script src="{{ request.script_root }}/static/admin/js/vendor/plotly.min.js"></script>
+	<script src="{{ request.script_root }}/themes/admin/static/js/vendor/plotly.min.js"></script>
 	<script type="text/javascript">
 		// $.distint(array)
 		// Unique elements in array

CTFd/themes/admin/templates/page.html

@@ -5,17 +5,17 @@
 		<title>Admin Panel</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<link rel="shortcut icon" href="{{ request.script_root }}/static/original/img/favicon.ico" type="image/x-icon">
-		<link rel="icon" href="{{ request.script_root }}/static/original/img/favicon.ico" type="image/x-icon">
-		<link rel="stylesheet" href="{{ request.script_root }}/static/admin/css/vendor/bootstrap.min.css">
-		<link rel="stylesheet" href="{{ request.script_root }}/static/admin/css/vendor/font-awesome/css/font-awesome.min.css" />
-		<link rel="stylesheet" href="{{ request.script_root }}/static/admin/css/style.css">
-		<link href='{{ request.script_root }}/static/admin/css/vendor/lato.css' rel='stylesheet' type='text/css'>
-		<link href='{{ request.script_root }}/static/admin/css/vendor/raleway.css' rel='stylesheet' type='text/css'>
-		<link rel="stylesheet" type="text/css" href="{{ request.script_root }}/static/admin/css/style.css">
-		<script src="{{ request.script_root }}/static/admin/js/vendor/moment.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/moment-timezone-with-data.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/handlebars.min.js"></script>
+		<link rel="shortcut icon" href="{{ request.script_root }}/themes/original/static/img/favicon.ico" type="image/x-icon">
+		<link rel="icon" href="{{ request.script_root }}/themes/original/static/img/favicon.ico" type="image/x-icon">
+		<link rel="stylesheet" href="{{ request.script_root }}/themes/admin/static/css/vendor/bootstrap.min.css">
+		<link rel="stylesheet" href="{{ request.script_root }}/themes/admin/static/css/vendor/font-awesome/css/font-awesome.min.css" />
+		<link rel="stylesheet" href="{{ request.script_root }}/themes/admin/static/css/style.css">
+		<link href='{{ request.script_root }}/themes/admin/static/css/vendor/lato.css' rel='stylesheet' type='text/css'>
+		<link href='{{ request.script_root }}/themes/admin/static/css/vendor/raleway.css' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" type="text/css" href="{{ request.script_root }}/themes/admin/static/css/style.css">
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/moment.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/moment-timezone-with-data.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/handlebars.min.js"></script>
 		<script type="text/javascript">
 				var script_root = "{{ request.script_root }}";
 		</script>
@@ -70,9 +70,9 @@
 				{{ content | safe }}
 		</div>
 </div>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/jquery.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/marked.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/bootstrap.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/jquery.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/marked.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/bootstrap.min.js"></script>
 		{% block scripts %} {% endblock %}
 </body>
 

CTFd/themes/admin/templates/pages.html

@@ -1,7 +1,7 @@
 {% extends "admin/base.html" %}
 
 {% block stylesheets %}
-	<link rel="stylesheet" type="text/css" href="{{ request.script_root }}/static/admin/css/vendor/codemirror.min.css">
+	<link rel="stylesheet" type="text/css" href="{{ request.script_root }}/themes/admin/static/css/vendor/codemirror.min.css">
 	<style>
 		.CodeMirror {
 			padding-left: 15px;
@@ -78,7 +78,7 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="{{ request.script_root }}/static/admin/js/vendor/codemirror.min.js"></script>
+<script src="{{ request.script_root }}/themes/admin/static/js/vendor/codemirror.min.js"></script>
 <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("pages-editor"), {
 	lineNumbers: true,

CTFd/themes/admin/templates/team.html

@@ -221,10 +221,10 @@
 {% endblock %}
 
 {% block scripts %}
-		<script src="{{ request.script_root }}/static/admin/js/vendor/moment.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/vendor/plotly.min.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
-		<script src="{{ request.script_root }}/static/admin/js/team.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/moment.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/vendor/plotly.min.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/utils.js"></script>
+		<script src="{{ request.script_root }}/themes/admin/static/js/team.js"></script>
 		<script>
 				$('#delete-solve').click(function (e) {
 						e.preventDefault();

CTFd/themes/admin/templates/wrong_keys.html

@@ -84,7 +84,7 @@
 {% endblock %}
 
 {% block scripts %}
-    <script src="{{ request.script_root }}/static/admin/js/utils.js"></script>
+    <script src="{{ request.script_root }}/themes/admin/static/js/utils.js"></script>
     <script>
         $('#delete-solve').click(function (e) {
             e.preventDefault();