Skip to content

Commit

Permalink
Merge branch 'hotfix/docu'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cvandeplas
cvandeplas committed Oct 29, 2013
2 parents 5811b51 + b8fa651 commit 78167dc
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/View/Elements/global_menu.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<li><a href="/users/news">News</a></li>
<li><a href="/users/view/me">My Profile</a></li>
<li><a href="/users/memberslist">Members List</a></li>
<li><a href="/pages/display/doc/general">User Guide</a></li>
<li><a href="/pages/display/doc/quickstart">User Guide</a></li>
<li><a href="/users/terms">Terms &amp; Conditions</a></li>
<li class="divider"></li>
<li><a href="/users/logout">Log out</a></li>
Expand Down
1 change: 1 addition & 0 deletions app/View/Pages/doc/administration.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="actions <?php echo $debugMode;?>">
<ol class="nav nav-list">
<li><?php echo $this->Html->link('Quick Start', array('controller' => 'pages', 'action' => 'display', 'doc', 'quickstart')); ?></li>
<li><?php echo $this->Html->link('General Layout', array('controller' => 'pages', 'action' => 'display', 'doc', 'general')); ?></li>
<li><?php echo $this->Html->link('General Concepts', array('controller' => 'pages', 'action' => 'display', 'doc', 'concepts')); ?></li>
<li><?php echo $this->Html->link('User Management and Global actions', array('controller' => 'pages', 'action' => 'display', 'doc', 'user_management')); ?></li>
Expand Down
1 change: 1 addition & 0 deletions app/View/Pages/doc/categories_and_types.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="actions <?php echo $debugMode;?>">
<ol class="nav nav-list">
<li><?php echo $this->Html->link('Quick Start', array('controller' => 'pages', 'action' => 'display', 'doc', 'quickstart')); ?></li>
<li><?php echo $this->Html->link('General Layout', array('controller' => 'pages', 'action' => 'display', 'doc', 'general')); ?></li>
<li><?php echo $this->Html->link('General Concepts', array('controller' => 'pages', 'action' => 'display', 'doc', 'concepts')); ?></li>
<li><?php echo $this->Html->link('User Management and Global actions', array('controller' => 'pages', 'action' => 'display', 'doc', 'user_management')); ?></li>
Expand Down
1 change: 1 addition & 0 deletions app/View/Pages/doc/concepts.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="actions <?php echo $debugMode;?>">
<ol class="nav nav-list">
<li><?php echo $this->Html->link('Quick Start', array('controller' => 'pages', 'action' => 'display', 'doc', 'quickstart')); ?></li>
<li><?php echo $this->Html->link('General Layout', array('controller' => 'pages', 'action' => 'display', 'doc', 'general')); ?></li>
<li class="active"><?php echo $this->Html->link('General Concepts', array('controller' => 'pages', 'action' => 'display', 'doc', 'concepts')); ?></li>
<li><?php echo $this->Html->link('User Management and Global actions', array('controller' => 'pages', 'action' => 'display', 'doc', 'user_management')); ?></li>
Expand Down
1 change: 1 addition & 0 deletions app/View/Pages/doc/general.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="actions <?php echo $debugMode;?>">
<ol class="nav nav-list">
<li><?php echo $this->Html->link('Quick Start', array('controller' => 'pages', 'action' => 'display', 'doc', 'quickstart')); ?></li>
<li class="active"><?php echo $this->Html->link('General Layout', array('controller' => 'pages', 'action' => 'display', 'doc', 'general')); ?></li>
<li><?php echo $this->Html->link('General Concepts', array('controller' => 'pages', 'action' => 'display', 'doc', 'concepts')); ?></li>
<li><?php echo $this->Html->link('User Management and Global actions', array('controller' => 'pages', 'action' => 'display', 'doc', 'user_management')); ?></li>
Expand Down
26 changes: 26 additions & 0 deletions app/View/Pages/doc/quickstart.ctp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<div class="actions <?php echo $debugMode;?>">
<ol class="nav nav-list">
<li class="active"><?php echo $this->Html->link('Quick Start', array('controller' => 'pages', 'action' => 'display', 'doc', 'quickstart')); ?></li>
<li><?php echo $this->Html->link('General Layout', array('controller' => 'pages', 'action' => 'display', 'doc', 'general')); ?></li>
<li><?php echo $this->Html->link('General Concepts', array('controller' => 'pages', 'action' => 'display', 'doc', 'concepts')); ?></li>
<li><?php echo $this->Html->link('User Management and Global actions', array('controller' => 'pages', 'action' => 'display', 'doc', 'user_management')); ?></li>
<li><?php echo $this->Html->link('Using the system', array('controller' => 'pages', 'action' => 'display', 'doc', 'using_the_system')); ?></li>
<li><?php echo $this->Html->link('Administration', array('controller' => 'pages', 'action' => 'display', 'doc', 'administration')); ?></li>
<li><?php echo $this->Html->link('Categories and Types', array('controller' => 'pages', 'action' => 'display', 'doc', 'categories_and_types')); ?></li>
</ol>
</div>

<div class="index">
<h2>Quick Start</h2>
<p>The Malware Information Sharing Platform (MISP) is the tool which will be used to facilitate the exchange of Indicator of Compromise (IOC) about
targeted malware and attacks within your community of trusted members. It is a central Indicator of Compromise (IOC) database with technical and
non-technical information. Exchanging this information should result in faster detection of targeted attacks and improve the detection ratio,
while also reducing the number of false positives.</p>
<h3>Create an Event</h3>
<p><img src="/img/doc/quick_create.jpg" alt = "" title = ""/></p>
<h3>Browsing past Events</h3>
<p><img src="/img/doc/quick_browse.jpg" alt = "" title = ""/></p>
<h3>Export Events for logsearches</h3>
<p><img src="/img/doc/quick_export.jpg" alt = "" title = ""/></p>

</div>
1 change: 1 addition & 0 deletions app/View/Pages/doc/user_management.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="actions <?php echo $debugMode;?>">
<ol class="nav nav-list">
<li><?php echo $this->Html->link('Quick Start', array('controller' => 'pages', 'action' => 'display', 'doc', 'quickstart')); ?></li>
<li><?php echo $this->Html->link('General Layout', array('controller' => 'pages', 'action' => 'display', 'doc', 'general')); ?></li>
<li><?php echo $this->Html->link('General Concepts', array('controller' => 'pages', 'action' => 'display', 'doc', 'concepts')); ?></li>
<li class="active"><?php echo $this->Html->link('User Management and Global actions', array('controller' => 'pages', 'action' => 'display', 'doc', 'user_management')); ?>
Expand Down
1 change: 1 addition & 0 deletions app/View/Pages/doc/using_the_system.ctp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="actions <?php echo $debugMode;?>">
<ol class="nav nav-list">
<li><?php echo $this->Html->link('Quick Start', array('controller' => 'pages', 'action' => 'display', 'doc', 'quickstart')); ?></li>
<li><?php echo $this->Html->link('General Layout', array('controller' => 'pages', 'action' => 'display', 'doc', 'general')); ?></li>
<li><?php echo $this->Html->link('General Concepts', array('controller' => 'pages', 'action' => 'display', 'doc', 'concepts')); ?></li>
<li><?php echo $this->Html->link('User Management and Global actions', array('controller' => 'pages', 'action' => 'display', 'doc', 'user_management')); ?></li>
Expand Down
Binary file added app/webroot/img/doc/quick_browse.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/webroot/img/doc/quick_create.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/webroot/img/doc/quick_export.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 78167dc

Please sign in to comment.