Restructured the files

skopp · Aug 16, 2012 · e290ff1 · e290ff1
1 parent df6b65c
commit e290ff1
Show file tree

Hide file tree

Showing 17 changed files with 127 additions and 125 deletions.
diff --git a/index.html b/index.html
@@ -44,14 +44,14 @@
 
     <link rel="shortcut icon" href="favicon.ico">
 
-    <link rel="stylesheet" type="text/css" href="interface.css">
-    <link rel="stylesheet" type="text/css" href="jsoneditor.css">
+    <link rel="stylesheet" type="text/css" href="interface/interface.css">
+    <link rel="stylesheet" type="text/css" href="jsoneditor/jsoneditor.css">
     <!-- TODO: droid font
         <link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>
     -->
 
-    <script type="text/javascript" src="jsoneditor-min.js"></script>
-    <script type="text/javascript" src="interface.js"></script>
+    <script type="text/javascript" src="jsoneditor/jsoneditor-min.js"></script>
+    <script type="text/javascript" src="interface/interface.js"></script>
 </head>
 
 <body spellcheck="false" >

diff --git a/interface.css → interface/interface.css b/interface.css → interface/interface.css
@@ -142,9 +142,9 @@ div.convert-right, div.convert-left {
 }
 
 div.convert-right {
-    background: url('img/jsoneditor-icons.png') -168px 0;
+    background: url('../jsoneditor/img/jsoneditor-icons.png') -168px 0;
 }
 
 div.convert-left {
-    background: url('img/jsoneditor-icons.png') -192px 0;
+    background: url('../jsoneditor/img/jsoneditor-icons.png') -192px 0;
 }
diff --git a/interface.js → interface/interface.js b/interface.js → interface/interface.js
diff --git a/jsoneditor-min.js b/jsoneditor-min.js
diff --git a/demo.html → jsoneditor/examples/demo.html b/demo.html → jsoneditor/examples/demo.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="jsoneditor.css">
-    <script type="text/javascript" src="jsoneditor-min.js"></script>
+    <link rel="stylesheet" type="text/css" href="../jsoneditor.css">
+    <script type="text/javascript" src="../jsoneditor.js"></script>
 </head>
 <body>
 <p>

diff --git a/img/colors.txt → jsoneditor/img/colors.txt b/img/colors.txt → jsoneditor/img/colors.txt
diff --git a/img/export.sh → jsoneditor/img/export.sh b/img/export.sh → jsoneditor/img/export.sh
diff --git a/img/jsoneditor-icons.png → jsoneditor/img/jsoneditor-icons.png b/img/jsoneditor-icons.png → jsoneditor/img/jsoneditor-icons.png
diff --git a/img/jsoneditor-icons.svg → jsoneditor/img/jsoneditor-icons.svg b/img/jsoneditor-icons.svg → jsoneditor/img/jsoneditor-icons.svg
diff --git a/jsoneditor/jsoneditor-min.js b/jsoneditor/jsoneditor-min.js
diff --git a/jsoneditor.css → jsoneditor/jsoneditor.css b/jsoneditor.css → jsoneditor/jsoneditor.css
diff --git a/jsoneditor.js → jsoneditor/jsoneditor.js b/jsoneditor.js → jsoneditor/jsoneditor.js
diff --git a/todo.txt → misc/todo.txt b/todo.txt → misc/todo.txt
diff --git a/index_no_ads.html → test.html b/index_no_ads.html → test.html
@@ -43,14 +43,14 @@
 
     <link rel="shortcut icon" href="favicon.ico">
 
-    <link href="interface.css" rel="stylesheet" type="text/css">
-    <link href="jsoneditor.css" rel="stylesheet" type="text/css">
+    <link href="interface/interface.css" rel="stylesheet" type="text/css">
+    <link href="jsoneditor/jsoneditor.css" rel="stylesheet" type="text/css">
     <!-- TODO: droid font
     <link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>
     -->
 
-    <script type="text/javascript" src="jsoneditor.js"></script>
-    <script type="text/javascript" src="interface.js"></script>
+    <script type="text/javascript" src="jsoneditor/jsoneditor.js"></script>
+    <script type="text/javascript" src="interface/interface.js"></script>
 
 </head>
 

diff --git a/couchdbeditor.html → test/couchdbeditor.html b/couchdbeditor.html → test/couchdbeditor.html
@@ -7,11 +7,11 @@
   <meta name="keywords" content="json, editor, couchdb, online, javascript, javascript object notation, treeview, open source, free">
   <meta name="author" content="Jos de Jong">
 
-  <link rel="shortcut icon" href="favicon.ico">
+  <link rel="shortcut icon" href="../favicon.ico">
 
   <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"></script>
-  <script type="text/javascript" src="jsoneditor.js"></script>
-  <link rel="stylesheet" type="text/css" href="jsoneditor.css">
+  <script type="text/javascript" src="../jsoneditor/jsoneditor.js"></script>
+  <link rel="stylesheet" type="text/css" href="../jsoneditor/jsoneditor.css">
 
   <style type="text/css">
     body, html {

diff --git a/tools/built.sh b/tools/built.sh
@@ -5,7 +5,7 @@ sh minify.sh
 cd ..
 
 package="jsoneditoronline.zip"
-files="index.html jsoneditor.js jsoneditor-min.js jsoneditor.css favicon.ico changelog.txt img LICENSE ../NOTICE"
+files="index.html jsoneditor/jsoneditor.js jsoneditor/jsoneditor-min.js jsoneditor/jsoneditor.css favicon.ico changelog.txt jsoneditor/img LICENSE NOTICE README"
 
 rm $package
 

diff --git a/tools/minify.sh b/tools/minify.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 compiler="compiler.jar"
-file="../jsoneditor.js"
-minifiedFile="../jsoneditor-min.js"
+file="../jsoneditor/jsoneditor.js"
+minifiedFile="../jsoneditor/jsoneditor-min.js"
 
 echo "Minifying file $file..."