Skip to content

Commit

Permalink
list button bug fix + rapyd assets fix
Browse files Browse the repository at this point in the history 
list button bug fix + rapyd assets fix
  • Loading branch information
@hamid
hamid committed Mar 4, 2015
1 parent 3499862 commit 51cb214
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 22 deletions.
9 changes: 6 additions & 3 deletions public/css/global.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ body{
border-radius: 250px;
box-shadow:0px 1px 1px rgba(0,0,0,1);
img{
width:110px;
width:110px;
border-radius: 250px;
border:7px solid rgba(255,255,255,.2);
}
Expand Down Expand Up @@ -177,6 +177,7 @@ body{
{
.items-bar
{
position: absolute;
padding: 11px 5px;
text-align: right;
float: right;
Expand All @@ -192,11 +193,13 @@ body{
}
#side-menu{
overflow: hidden;
a{display: inline-block;}
a{display: inline-block; max-width: 120px;}
a:first{display: block}
.badge{
float: right;
margin: 11px;
margin: 11px;
position: absolute;
right: 0px;
}

li:hover{
Expand Down
2 changes: 1 addition & 1 deletion public/css/styles.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/views/mainTemplate.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@

@if ( in_array($value['url'], $urls))
{{--*/ $model = "Serverfireteam\Panel\\".$value['url'] /*--}}
<li class="{{ (Request::segment(2)==$value['url'])?'active':'' }}">
<a href="{{ url('panel/'.$value['url'].'/all') }}" class="{{ (Request::segment(2)==$value['url'])?'active':'' }}"><i class="fa fa-edit fa-fw"></i> {{{$value['display']}}} </a> <span class="badge pull-right">{!!$model::all()->count()!!}</span> <div class="items-bar"> <a href="{{ url('panel/'.$value['url'].'/edit') }}" class="">add</a> <a href="{{ url('panel/'.$value['url'].'/all') }}"> list </a> </div>
<li >
<a href="{{ url('panel/'.$value['url'].'/all') }}" class=" s-link {{ (Request::segment(2)==$value['url'])?'active':'' }}"><i class="fa fa-edit fa-fw"></i> {{{$value['display']}}} </a> <span class="badge pull-right">{!!$model::all()->count()!!}</span> <div class="items-bar"> <a href="{{ url('panel/'.$value['url'].'/edit') }}" class="">add</a> <a href="{{ url('panel/'.$value['url'].'/all') }}"> list </a> </div>

</li>
@else
{{--*/ $model = "\App\\".$value['url'] /*--}}
<li class="{{ (Request::segment(2)==$value['url'])?'active':'' }}">
<a href="{{ url('panel/'.$value['url'].'/all') }}" ><i class="fa fa-edit fa-fw"></i> {{{$value['display']}}} <span class="badge pull-right">{!!$model::all()->count()!!}</span></a>
<li class="s-link {{ (Request::segment(2)==$value['url'])?'active':'' }}">
<a href="{{ url('panel/'.$value['url'].'/all') }}" class="{{ (Request::segment(2)==$value['url'])?'active':'' }}"><i class="fa fa-edit fa-fw"></i> {{{$value['display']}}} </a> <span class="badge pull-right">{!!$model::all()->count()!!}</span> <div class="items-bar"> <a href="{{ url('panel/'.$value['url'].'/edit') }}" class="">add</a> <a href="{{ url('panel/'.$value['url'].'/all') }}"> list </a> </div>
</li>
@endif
@endforeach
Expand Down
28 changes: 14 additions & 14 deletions src/views/master.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/serverfireteam/rapyd-laravel/assets/demo/style.css")}}">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/serverfireteam/rapyd-laravel/assets/redactor/css/redactor.css")}}">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/serverfireteam/rapyd-laravel/assets/datepicker/datepicker3.css")}}">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/serverfireteam/rapyd-laravel/assets/autocomplete/autocomplete.css")}}">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/serverfireteam/rapyd-laravel/assets/autocomplete/bootstrap-tagsinput.css")}}" >
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/serverfireteam/rapyd-laravel/assets/colorpicker/css/bootstrap-colorpicker.min.css")}}" >
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/zofe/rapyd/assets/demo/style.css")}}">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/zofe/rapyd/assets/redactor/css/redactor.css")}}">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/zofe/rapyd/assets/datepicker/datepicker3.css")}}">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/zofe/rapyd/assets/autocomplete/autocomplete.css")}}">
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/zofe/rapyd/assets/autocomplete/bootstrap-tagsinput.css")}}" >
<link media="all" type="text/css" rel="stylesheet" href="{{asset("packages/zofe/rapyd/assets/colorpicker/css/bootstrap-colorpicker.min.css")}}" >


<title>@yield('title')</title>
Expand Down Expand Up @@ -74,14 +74,14 @@
<!-- Custom Theme JavaScript -->
<script src="{{asset("packages/serverfireteam/panel/js/sb-admin-2.js")}}"></script>

<script src="{{asset("packages/serverfireteam/rapyd-laravel/assets/redactor/jquery.browser.min.js")}}"></script>
<script src="{{asset("packages/serverfireteam/rapyd-laravel/assets/redactor/redactor.min.js")}}"></script>
<script src="{{asset("packages/serverfireteam/rapyd-laravel/assets/datepicker/bootstrap-datepicker.js")}}"></script>
<script src="{{asset("packages/serverfireteam/rapyd-laravel/assets/datepicker/locales/bootstrap-datepicker.it.js")}}"></script>
<script src="{{asset("packages/serverfireteam/rapyd-laravel/assets/autocomplete/typeahead.bundle.min.js")}}"></script>
<script src="{{asset("packages/serverfireteam/rapyd-laravel/assets/template/handlebars.js")}}"></script>
<script src="{{asset("packages/serverfireteam/rapyd-laravel/assets/autocomplete/bootstrap-tagsinput.min.js")}}"></script>
<script src="{{asset("packages/serverfireteam/rapyd-laravel/assets/colorpicker/js/bootstrap-colorpicker.min.js")}}"></script>
<script src="{{asset("packages/zofe/rapyd/assets/redactor/jquery.browser.min.js")}}"></script>
<script src="{{asset("packages/zofe/rapyd/assets/redactor/redactor.min.js")}}"></script>
<script src="{{asset("packages/zofe/rapyd/assets/datepicker/bootstrap-datepicker.js")}}"></script>
<script src="{{asset("packages/zofe/rapyd/assets/datepicker/locales/bootstrap-datepicker.it.js")}}"></script>
<script src="{{asset("packages/zofe/rapyd/assets/autocomplete/typeahead.bundle.min.js")}}"></script>
<script src="{{asset("packages/zofe/rapyd/assets/template/handlebars.js")}}"></script>
<script src="{{asset("packages/zofe/rapyd/assets/autocomplete/bootstrap-tagsinput.min.js")}}"></script>
<script src="{{asset("packages/zofe/rapyd/assets/colorpicker/js/bootstrap-colorpicker.min.js")}}"></script>


{!! Rapyd::scripts() !!}
Expand Down

0 comments on commit 51cb214

Please sign in to comment.