Merge pull request #12 from okulbilisim/master

merge 10
academic · Jul 9, 2014 · b6c9910 · b6c9910
2 parents ef8ca1b + 5c82da4
commit b6c9910
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/app/Resources/views/ojsbase.html.twig b/app/Resources/views/ojsbase.html.twig
@@ -29,6 +29,7 @@
             {%include '::ojsleft.html.twig'%}
         <!-- Right side column. Contains the navbar and content of the page -->
         <aside class="col-md-10">
+            {% if ojsuser %}
             <!-- Content Header (Page header) -->
             <section class="content-header">
                 <strong>
@@ -38,6 +39,7 @@
                         {% endblock %}
                 </strong> 
             </section>
+            {%endif%}
 
             <!-- Main content -->
             <section>

diff --git a/docs/Roles.md b/docs/Roles.md
@@ -6,8 +6,8 @@ Ojs has 14 types of role definition.
 
 | Role Name 					| Role Description							|
 |-------------------------------|-------------------------------------------|
+| ROLE_USER 					| Standart User								|
 | ROLE_ADMIN 					| Administrator								|
-|-------------------------------|-------------------------------------------|
 | ROLE_SYSTEM_ADMIN				| System Administrator						|
 | ROLE_SUPER_EDITOR			 	| Super Editor. Editor for all journals		|
 | ROLE_SUPER_AUTHOR			 	| Super Author. Author for all journals		|
@@ -26,7 +26,9 @@ Ojs has 14 types of role definition.
 Journal Roles
 -------------
 
-Each journal has standart roles which listed belove. But every journal has its own special role with its' system defined unique id.
+Journal roles are stored on `UserJournalRole` table;
+
+Each journal has standard roles which listed belove. But every journal has its own special role with its' system defined unique id.
 
 **Example**
 
@@ -40,20 +42,23 @@ Each journal has standart roles which listed belove. But every journal has its o
     id: 45
     title: Applied Mathematics
 
-*User_Journal:*
-
-    user_id: 123
-    journal_id: 45
-
 *Role:*
 
     id: 6
     name: ROLE_EDITOR
 
 
-
 *User_Journal_Role:*
 
     journal_id: 45
     user_id: 123
-    role_id: 6 
+    role_id: 6 
+
+
+
+System Roles
+------------
+
+System roles are stored on `User_Role`
+
+
diff --git a/src/Ojstr/ManagerBundle/Resources/views/index.html.twig b/src/Ojstr/ManagerBundle/Resources/views/index.html.twig
@@ -1,19 +1,12 @@
 {% extends "::ojsbase.html.twig" %}
 
 {% block body %}   
-    {% if ojsuser %}
-<a class="btn btn-success" href="{{path('dashboard')}}"><i class="glyphicon glyphicon-flag"></i> 
-    Manager Dashboard</a>
-{%else%}
-
-<a class="btn btn-info" href="/login"><i class="glyphicon glyphicon-log-in"></i> 
-    Login</a>
-    {%endif%}
-
 
+<a class="btn btn-info" href="/login"><i class="glyphicon glyphicon-log-in"></i> Login</a>
 
 {% endblock %}
 
 {% block footer %}
-&copy; Ojs-tr demo
+<hr>
+<small> &copy; Okulbilişim <a href="http://okulbilisim.com">okulbilisim.com</a></small>
 {% endblock %}