Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

Merge #59

Merged
merged 10 commits into from
Jul 11, 2014
Merged

Merge #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
779efda
Merge pull request #8 from okulbilisim/master
hmert Jul 3, 2014
8f69d34
Merge pull request #9 from okulbilisim/master
hmert Jul 3, 2014
3bc3957
Merge pull request #10 from okulbilisim/master
hmert Jul 7, 2014
ef8ca1b
Merge pull request #11 from okulbilisim/master
hmert Jul 8, 2014
b6c9910
Merge pull request #12 from okulbilisim/master
hmert Jul 9, 2014
e88ede9
Merge pull request #13 from okulbilisim/master
hmert Jul 10, 2014
3d0480a
for ipv4 it has to be 127.0.0.1
hmert Jul 11, 2014
378a88c
composer update
hmert Jul 11, 2014
ed86c01
search bar implemented fixed #57
hmert Jul 11, 2014
09ba237
branding Charmender fixed #58
hmert Jul 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
159 changes: 85 additions & 74 deletions app/Resources/views/ojsheader.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,95 +9,106 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">Ojstr</a>
<a class="navbar-brand" href="/">Ojstrx</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="ojs-navbar-collapse">

{%include '::language_selector.html.twig'%}

<div class="navbar-right">
<ul class="nav navbar-nav">
{% if ojsuser %}
<li class="dropdown messages-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-envelope"></i>
<span class="label label-success"><!--$count--></span>
</a>
<ul class="dropdown-menu">
<li>
<ul class="menu">
{% if ojsuser %}
<li class="dropdown messages-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-envelope"></i>
<span class="label label-success"><!--$count--></span>
</a>
<ul class="dropdown-menu">
<li>
<ul class="menu">

</ul>
</li>
<li class="footer"><a href="#">See All Messages</a></li>
</ul>
</li>
<li class="dropdown notifications-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-warning"></i>
<span class="label label-warning"><!--$count--></span>
</a>
<ul class="dropdown-menu">
</ul>
</li>
<li class="footer"><a href="#">See All Messages</a></li>
</ul>
</li>
<li class="dropdown notifications-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-warning"></i>
<span class="label label-warning"><!--$count--></span>
</a>
<ul class="dropdown-menu">

<li>
<ul class="menu">
<li>
<ul class="menu">

</ul>
</li>
<li class="footer"><a href="#">View all</a></li>
</ul>
</li>
<li class="dropdown tasks-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-tasks"></i>
<span class="label label-danger"><!--$count--></span>
</a>
<ul class="dropdown-menu">
<li>
<ul class="menu">
</ul>
</li>
<li class="footer"><a href="#">View all</a></li>
</ul>
</li>
<li class="dropdown tasks-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-tasks"></i>
<span class="label label-danger"><!--$count--></span>
</a>
<ul class="dropdown-menu">
<li>
<ul class="menu">

</ul>
</li>
<li class="footer">
<a href="#">View all</a>
</li>
</ul>
</li>
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-user"></i>
<span>{{ojsuser.getUsername()}} <i class="caret"></i></span>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header bg-light-blue">
{% if(ojsuser.getAvatar()) %}
<img src="/uploads/avatars/thumbnail/{{ojsuser.getAvatar()}}" class="img-circle" alt="User Image" />
{%else%}
<img src="/assets/images/buddy_sample.png" class="img-circle" alt="User Image" />
{%endif%}
<p>
<small>Last login : {{ojsuser.getLastogin()|date('Y-m-d H:i:s')}}</small>
</p>
</li>
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
<a href="{{path('manager_profile')}}" class="btn btn-default btn-flat">Profile</a>
</div>
<div class="pull-right">
<a href="{{ path('logout') }}" class="btn btn-default btn-flat">Sign out</a>
</div>
</li>
</ul>
</li>
{%endif%}
</ul>
</li>
<li class="footer">
<a href="#">View all</a>
</li>
</ul>
</li>
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-user"></i>
<span>{{ojsuser.getUsername()}} <i class="caret"></i></span>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header bg-light-blue">
{% if(ojsuser.getAvatar()) %}
<img src="/uploads/avatars/thumbnail/{{ojsuser.getAvatar()}}" class="img-circle" alt="User Image" />
{%else%}
<img src="/assets/images/buddy_sample.png" class="img-circle" alt="User Image" />
{%endif%}
<p>
<small>Last login : {{ojsuser.getLastogin()|date('Y-m-d H:i:s')}}</small>
</p>
</li>
<!-- Menu Footer-->
<li class="user-footer">
<div class="pull-left">
<a href="{{path('manager_profile')}}" class="btn btn-default btn-flat">Profile</a>
</div>
<div class="pull-right">
<a href="{{ path('logout') }}" class="btn btn-default btn-flat">Sign out</a>
</div>
</li>
</ul>
</li>
{%endif%}
<ul class="nav navbar-nav navbar-right">
<li><a href="#search">Search</a>
<div id="search">
<button type="button" class="close">×</button>
<form>
<input type="search" value="" placeholder="type keyword(s) here" />
<button type="submit" class="btn btn-primary">Search</button>
</form>
</div>
</li>
</ul>
</ul>
</div>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>

</header>
</header>
2 changes: 1 addition & 1 deletion app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ framework:
doctrine_mongodb:
connections:
default:
server: mongodb://localhost:27017
server: mongodb://127.0.0.1:27017
options: {}
default_database: ojs
document_managers:
Expand Down