Skip to content

Commit

Permalink
Combined the SyntaxHighlighter to a single file and gave it a nice la…
Browse files Browse the repository at this point in the history
…yout
  • Loading branch information
Douwe de Haan committed Jan 8, 2013
1 parent a06fb07 commit db52aa4
Show file tree
Hide file tree
Showing 9 changed files with 334 additions and 321 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

.DS_Store
8 changes: 0 additions & 8 deletions assets/css/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,6 @@ li {
margin-left: 20px;
}

pre {
font: 12px "Consolas", monospace;
margin: 10px 0;
padding: 10px;
background-color: #FFF7CC;
border: 1px solid #CCC;
}

table {
margin: 0 0 10px;
border-collapse: collapse;
Expand Down
316 changes: 315 additions & 1 deletion assets/js/shCore.js → assets/js/SyntaxHighlighter.js

Large diffs are not rendered by default.

91 changes: 0 additions & 91 deletions assets/js/shBrushCss.js

This file was deleted.

52 changes: 0 additions & 52 deletions assets/js/shBrushJScript.js

This file was deleted.

88 changes: 0 additions & 88 deletions assets/js/shBrushPhp.js

This file was deleted.

66 changes: 0 additions & 66 deletions assets/js/shBrushSql.js

This file was deleted.

15 changes: 8 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
<link rel="stylesheet" type="text/css" href="assets/css/shThemeDefault.css" media="screen,print">

<script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
<script type="text/javascript" src="assets/js/shCore.js"></script>
<script type="text/javascript" src="assets/js/shBrushCss.js"></script>
<script type="text/javascript" src="assets/js/shBrushJScript.js"></script>
<script type="text/javascript" src="assets/js/shBrushPhp.js"></script>
<script type="text/javascript" src="assets/js/shBrushSql.js"></script>
<script type="text/javascript" src="assets/js/SyntaxHighlighter.js"></script>

</head>

Expand All @@ -39,9 +35,14 @@ <h1>Inhoudsopgave</h1>
<!-- START CONTENT -->

<!-- END CONTENT -->

</div>
</div>
</div>
</div>
<script type="text/javascript">
SyntaxHighlighter.defaults['gutter'] = false;
SyntaxHighlighter.defaults['toolbar'] = false;
SyntaxHighlighter.all();
</script>
</body>
</html>
17 changes: 9 additions & 8 deletions security.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
<link rel="stylesheet" type="text/css" href="assets/css/shThemeDefault.css" media="screen,print">

<script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
<script type="text/javascript" src="assets/js/shCore.js"></script>
<script type="text/javascript" src="assets/js/shBrushCss.js"></script>
<script type="text/javascript" src="assets/js/shBrushJScript.js"></script>
<script type="text/javascript" src="assets/js/shBrushPhp.js"></script>
<script type="text/javascript" src="assets/js/shBrushSql.js"></script>
<script type="text/javascript" src="assets/js/SyntaxHighlighter.js"></script>

</head>

Expand All @@ -41,7 +37,7 @@ <h2>Password hashing</h2>
Passwords are that are saved to the database are appended with a security salt. This salt is hardcoded in the user model and can only be changed by the technical staff. After adding the salt the password gets encrypted as a SHA1 hash.
Example of the file:
<span class="bold">models/user_model.php</span>
<pre>
<pre class="brush: php">
private $salt = 'PAwEr&^52sd+=2Y%T';

public function encrypt($password) {
Expand Down Expand Up @@ -103,7 +99,7 @@ <h2>Forgot password</h2>

<h2>Sessions</h2>
<p>Because all controllers used for the dashboard extend on the Admin_Controller they have access to the session function. When checking if a user is logged in you can use the following function:</p>
<pre>
<pre class="brush: php">
if ($this->logged_in) {
// user is logged in
}
Expand Down Expand Up @@ -163,6 +159,11 @@ <h2>Sessions</h2>

</div>
</div>
</div>
</div>
<script type="text/javascript">
SyntaxHighlighter.defaults['gutter'] = false;
SyntaxHighlighter.defaults['toolbar'] = false;
SyntaxHighlighter.all();
</script>
</body>
</html>

0 comments on commit db52aa4

Please sign in to comment.