Formatting

This commit is contained in:
James Brooks
2016-10-08 17:45:40 +01:00
parent e12c94827d
commit a5d3a71063
4 changed files with 54 additions and 56 deletions

View File

@@ -1,35 +1,35 @@
@if($enable_external_dependencies) @if($enable_external_dependencies)
@if($app_analytics) @if($app_analytics)
<script> <script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{ $app_analytics }}', '{{ $_SERVER['SERVER_NAME'] or '' }}'); ga('create', '{{ $app_analytics }}', '{{ $_SERVER['SERVER_NAME'] or '' }}');
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>
@endif @endif
@if($app_analytics_go_squared) @if($app_analytics_go_squared)
<script> <script>
!function(g,s,q,r,d){r=g[r]=g[r]||function(){(r.q=r.q||[]).push( !function(g,s,q,r,d){r=g[r]=g[r]||function(){(r.q=r.q||[]).push(
arguments)};d=s.createElement(q);q=s.getElementsByTagName(q)[0]; arguments)};d=s.createElement(q);q=s.getElementsByTagName(q)[0];
d.src='https://d1l6p2sc9645hc.cloudfront.net/tracker.js';q.parentNode. d.src='https://d1l6p2sc9645hc.cloudfront.net/tracker.js';q.parentNode.
insertBefore(d,q)}(window,document,'script','_gs'); insertBefore(d,q)}(window,document,'script','_gs');
_gs('{{ $app_analytics_go_squared }}'); _gs('{{ $app_analytics_go_squared }}');
</script> </script>
@endif @endif
@if($app_analytics_piwik_url) @if($app_analytics_piwik_url)
<script type="text/javascript"> <script type="text/javascript">
var _paq = _paq || []; var _paq = _paq || [];
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']); _paq.push(['enableLinkTracking']);
(function() { (function() {
var u="https://{{ $app_analytics_piwik_url }}"; var u="https://{{ $app_analytics_piwik_url }}";
_paq.push(['setTrackerUrl', u+'/piwik.php']); _paq.push(['setTrackerUrl', u+'/piwik.php']);
_paq.push(['setSiteId', {{ $app_analytics_piwik_site_id }}]); _paq.push(['setSiteId', {{ $app_analytics_piwik_site_id }}]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'/piwik.js'; s.parentNode.insertBefore(g,s); g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'/piwik.js'; s.parentNode.insertBefore(g,s);
})(); })();
</script> </script>
<noscript><p><img src="https://{{ $app_analytics_piwik_url }}/piwik.php?idsite={{ $app_analytics_piwik_site_id }}" style="border:0;" alt="" /></p></noscript> <noscript><p><img src="https://{{ $app_analytics_piwik_url }}/piwik.php?idsite={{ $app_analytics_piwik_site_id }}" style="border:0;" alt="" /></p></noscript>
@endif @endif

View File

@@ -9,9 +9,9 @@
checked="checked" checked="checked"
@endif /> @endif />
{{ $component->name }} {{ $component->name }}
</label> </label>
</div> </div>
@if($component->description) @if($component->description)
<i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}" data-container="body"></i> <i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}" data-container="body"></i>
@endif @endif
</li> </li>

View File

@@ -23,9 +23,7 @@
@if($ungrouped_components->count() > 0) @if($ungrouped_components->count() > 0)
<ul class="list-group components"> <ul class="list-group components">
<li class="list-group-item group-name"> <li class="list-group-item group-name"><strong>{{ trans('cachet.components.group.other') }}</strong></li>
<strong>{{ trans('cachet.components.group.other') }}</strong>
</li>
@foreach($ungrouped_components as $component) @foreach($ungrouped_components as $component)
@include('partials.component', compact($component)) @include('partials.component', compact($component))
@endforeach @endforeach

View File

@@ -1,33 +1,33 @@
@if($component_groups->count() > 0) @if($component_groups->count() > 0)
@foreach($component_groups as $componentGroup) @foreach($component_groups as $componentGroup)
<ul class="list-group components"> <ul class="list-group components">
@if($componentGroup->enabled_components->count() > 0) @if($componentGroup->enabled_components->count() > 0)
<li class="list-group-item group-name"> <li class="list-group-item group-name">
<i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i> <i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i>
<strong>{{ $componentGroup->name }}</strong> <strong>{{ $componentGroup->name }}</strong>
<div class="pull-right text-muted small"> <div class="pull-right text-muted small">
<a href="#" class="select-group" id="select-all-{{$componentGroup->id}}">Select All</a> <a href="#" class="select-group" id="select-all-{{$componentGroup->id}}">Select All</a>
&nbsp;|&nbsp; &nbsp;|&nbsp;
<a href="#" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">Deselect All</a> <a href="#" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">Deselect All</a>
</div> </div>
</li> </li>
<div class="form-group group-items {{ $componentGroup->has_subscriber($subscriptions) ? null : "hide" }}"> <div class="form-group group-items {{ $componentGroup->has_subscriber($subscriptions) ? null : "hide" }}">
@foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component) @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
@include('partials.component_input', compact($component)) @include('partials.component_input', compact($component))
@endforeach @endforeach
</div> </div>
@endif @endif
</ul> </ul>
@endforeach @endforeach
@endif @endif
@if($ungrouped_components->count() > 0) @if($ungrouped_components->count() > 0)
<ul class="list-group components"> <ul class="list-group components">
<li class="list-group-item group-name"> <li class="list-group-item group-name">
<strong>{{ trans('cachet.components.group.other') }}</strong> <strong>{{ trans('cachet.components.group.other') }}</strong>
</li> </li>
@foreach($ungrouped_components as $component) @foreach($ungrouped_components as $component)
@include('partials.component_input', compact($component)) @include('partials.component_input', compact($component))
@endforeach @endforeach
</ul> </ul>
@endif @endif