Merge pull request #73 from PidgeyL/development

Development
pombredanne · Feb 25, 2015 · 32bdb8b · 32bdb8b
2 parents ed09a5f + 0157f76
commit 32bdb8b
Show file tree

Hide file tree

Showing 20 changed files with 78 additions and 9,333 deletions.
diff --git a/web/static/css/bootstrap-theme.css b/web/static/css/bootstrap-theme.css
diff --git a/web/static/css/bootstrap-theme.css.map b/web/static/css/bootstrap-theme.css.map
diff --git a/web/static/css/bootstrap-theme.min.css b/web/static/css/bootstrap-theme.min.css
diff --git a/web/static/css/bootstrap.css b/web/static/css/bootstrap.css
diff --git a/web/static/css/bootstrap.css.map b/web/static/css/bootstrap.css.map
diff --git a/web/static/flash/ZeroClipboard.swf b/web/static/flash/ZeroClipboard.swf
diff --git a/web/static/js/ZeroClipboard.min.js b/web/static/js/ZeroClipboard.min.js
diff --git a/web/static/js/bootstrap.js b/web/static/js/bootstrap.js
diff --git a/web/static/js/custom/cve.js b/web/static/js/custom/cve.js
@@ -1,3 +1,21 @@
+function copyToClipboard() {
+  var oTable = document.getElementById('cveInfo');
+  var rowLength = oTable.rows.length;
+  var text = ""
+  for (i = 0; i < rowLength; i++){
+    var oCells = oTable.rows.item(i).cells;
+    var cellLength = oCells.length;
+    var attribute = oCells.item(0).innerHTML;
+    var value = oCells.item(1).innerHTML;
+    var toAdd = attribute + ": \t" + value;
+    text = text + toAdd + "\n";
+  }
+  text = text.replace(/<\/?[^>]+(>|$)/g, "");
+  text = text.replace(/\n\s+\n/g, "\n");
+  text = text.trim();
+  return text;
+}
+
 jQuery(document).ready(function() {
   jQuery('.colfield').on('click', function (event) {
     if (event.target !== this) return;
@@ -6,3 +24,9 @@ jQuery(document).ready(function() {
   })
 });
 
+$(document).ready(function() {
+  var client = new ZeroClipboard($("#copy-button"), {
+      moviePath: "/static/js/ZeroClipboard.swf"
+    });
+  client.setText(copyToClipboard());
+});
diff --git a/web/static/js/npm.js b/web/static/js/npm.js
diff --git a/web/templates/admin.html b/web/templates/admin.html
@@ -2,29 +2,12 @@
 <html lang="en">
 <head>
   <title>Admin page</title>
-  <!-- metadata -->
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
-
+  <!-- defaults -->
+  {% include 'defaultHead.html' %}
   <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
   <link href="/static/css/custom/admin.css" rel="stylesheet" />
 
-  <!-- favicon -->
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
   <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
   <script type="text/javascript" src="/static/js/custom/admin.js"></script>
 </head>
 

diff --git a/web/templates/browse.html b/web/templates/browse.html
@@ -2,28 +2,8 @@
 <html lang="en">
 <head>
   <title>Vendor browsing</title>
-  <!-- metadata -->
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
-
-  <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
-
-  <!-- favicon -->
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
-  <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
+  <!-- defaults -->
+  {% include 'defaultHead.html' %}
 </head>
 
 <body>

diff --git a/web/templates/cve.html b/web/templates/cve.html
@@ -2,31 +2,10 @@
 <html lang="en">
 <head>
   <title>{{cve['id']}} - {{cve['summary'][:100]}}</title>
-  <!-- metadata -->
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
--
-  <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
-
-  <!-- favicon -->
-  <link rel="apple-touch-glyphicon-precomposed" sizes="144x144" href="href" static="static" img="img" apple-touch-glyphicon-144-precomposed.png="apple-touch-glyphicon-144-precomposed.png"/>
-  <link rel="apple-touch-glyphicon-precomposed" sizes="72x72" href="/static/img/apple-touch-glyphicon-72-precomposed.png"/>
-  <link rel="apple-touch-glyphicon-precomposed" href="/static/img/apple-touch-glyphicon-57-precomposed.png"/>
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
+  <!-- defaults -->
+  {% include 'defaultHead.html' %}
   <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
+  <script type="text/javascript" src="/static/js/ZeroClipboard.min.js"></script>
   <script type="text/javascript" src="/static/js/custom/cve.js"></script>
 </head>
 
@@ -45,7 +24,9 @@
             <li class="active">{{cve['id']}}</li>
           </ol>
           <!-- CVE -->
-          <table class="table table-hover table-striped">
+
+<input type="button" id="copy-button" name="copy" value="Copy to Clipboard" />
+          <table id="cveInfo" class="table table-hover table-striped">
             <tbody>
               <tr>
                 <td class="warning">ID</td>

diff --git a/web/templates/defaultHead.html b/web/templates/defaultHead.html
@@ -0,0 +1,22 @@
+  <!-- metadata -->
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
+  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
+  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
+
+  <!-- css -->
+  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
+  <link href="/static/css/style.css" rel="stylesheet" />
+
+  <!-- favicon -->
+  <link rel="shortcut icon" href="/static/img/favicon.ico" />
+
+  <!-- javascript -->
+  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+  <!--[if lt IE 9]>
+    <script src="js/html5shiv.js"></script>
+  <![endif]-->
+  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
+  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
+  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
diff --git a/web/templates/index.html b/web/templates/index.html
@@ -2,29 +2,13 @@
 <html lang="en">
 <head>
   <title>Common Vulnerability Exposure most recent entries</title>
-  <!-- metadata -->
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
+  <!-- defaults -->
+  {% include 'defaultHead.html' %}
 
   <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
   <link href="/static/css/custom/filter.css" rel="stylesheet" />
 
-  <!-- favicon -->
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
   <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
   <script type="text/javascript" src="/static/js/custom/filter.js"></script>
   <script type="text/javascript">
     function setSettings(){

diff --git a/web/templates/linked.html b/web/templates/linked.html
@@ -2,29 +2,11 @@
 <html lang="en">
 <head>
   <title>CVE's linked by {{field}}</title>
-  <!-- metadata -->
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
+  <!-- defaults -->
+  {% include 'defaultHead.html' %}
 
   <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
   <link href="/static/css/custom/filter.css" rel="stylesheet" />
-
-  <!-- favicon -->
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
-  <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
 </head>
 
 <body>

diff --git a/web/templates/list.html b/web/templates/list.html
@@ -2,28 +2,9 @@
 <html lang="en">
 <head>
   <title>{{ listType }} management</title>
-  <!-- metadata -->
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
-
-  <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
-
-  <!-- favicon -->
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
+  <!-- defaults -->
+  {% include 'defaultHead.html' %}
   <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
   <script type="text/javascript">
     var editedCPE
     function addItem() {

diff --git a/web/templates/listmanagement.html b/web/templates/listmanagement.html
@@ -2,28 +2,9 @@
 <html lang="en">
 <head>
   <title>CPE browser</title>
-  <!-- metadata -->
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
-
-  <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
-
-  <!-- favicon -->
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
+  <!-- defaults -->
+  {% include 'defaultHead.html' %}
   <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
   <script type="text/javascript">
     function addCPE(list, item){
       var url = "/admin/listmanagement/add";

diff --git a/web/templates/login.html b/web/templates/login.html
@@ -2,29 +2,8 @@
 <html lang="en">
 <head>
   <title>Login page</title>
-  <!-- metadata -->
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
-
-  <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
-
-  <!-- favicon -->
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
-  <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
-  <script type="text/javascript" src="/static/js/custom/admin.js"></script>
+   <!-- defaults -->
+  {% include 'defaultHead.html' %}
 </head>
 
 <body>

diff --git a/web/templates/search.html b/web/templates/search.html
@@ -2,28 +2,8 @@
 <html lang="en">
 <head>
   <title>Vendor browsing</title>
-  <!-- metadata -->
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta name="description" content="Common Vulnerability Exposure most recent entries"/>
-  <meta name="author" content="http://github.com/adulau/cve-search - cve-search"/>
-  <meta name="author" content="http://github.com/pidgeyl/cve-search - cve-search"/>
-
-  <!-- css -->
-  <link href="/static/css/bootstrap.min.css" rel="stylesheet" />
-  <link href="/static/css/style.css" rel="stylesheet" />
-
-  <!-- favicon -->
-  <link rel="shortcut icon" href="/static/img/favicon.ico" />
-
-  <!-- javascript -->
-  <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-  <!--[if lt IE 9]>
-    <script src="js/html5shiv.js"></script>
-  <![endif]-->
-  <script type="text/javascript" src="/static/js/jquery-1.11.2.min.js"></script>
-  <script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="/static/js/custom/scripts.js"></script>
+  <!-- defaults -->
+  {% include 'defaultHead.html' %}
 </head>
 
 <body>