From 030db6e26761b1def525ee3692e4de4fa6715452 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Nov 2013 04:10:25 -0500 Subject: [PATCH 1/7] Upgrading to bootstrap 3 Ugh. --- app/storage/logs/.gitignore | 2 - app/storage/views/.gitignore | 2 - app/views/backend/categories/edit.blade.php | 4 +- app/views/backend/categories/index.blade.php | 8 +- .../backend/depreciations/edit.blade.php | 10 +- .../backend/depreciations/index.blade.php | 10 +- app/views/backend/groups/create.blade.php | 10 +- app/views/backend/groups/edit.blade.php | 10 +- app/views/backend/groups/index.blade.php | 10 +- app/views/backend/hardware/checkin.blade.php | 14 +- app/views/backend/hardware/checkout.blade.php | 16 +- app/views/backend/hardware/clone.blade.php | 38 +- app/views/backend/hardware/edit.blade.php | 210 +- app/views/backend/hardware/index.blade.php | 28 +- app/views/backend/hardware/view.blade.php | 75 +- app/views/backend/layouts/default.blade.php | 110 +- app/views/backend/licenses/checkin.blade.php | 18 +- app/views/backend/licenses/checkout.blade.php | 20 +- app/views/backend/licenses/edit.blade.php | 38 +- app/views/backend/licenses/index.blade.php | 8 +- app/views/backend/licenses/view.blade.php | 60 +- app/views/backend/locations/edit.blade.php | 39 +- app/views/backend/locations/index.blade.php | 8 +- .../backend/manufacturers/edit.blade.php | 12 +- .../backend/manufacturers/index.blade.php | 4 +- app/views/backend/models/edit.blade.php | 20 +- app/views/backend/models/index.blade.php | 12 +- app/views/backend/models/view.blade.php | 12 +- app/views/backend/reports/index.blade.php | 22 +- app/views/backend/settings/edit.blade.php | 14 +- app/views/backend/settings/index.blade.php | 8 +- app/views/backend/statuslabels/edit.blade.php | 10 +- .../backend/statuslabels/index.blade.php | 8 +- app/views/backend/users/create.blade.php | 28 +- app/views/backend/users/edit.blade.php | 28 +- app/views/backend/users/index.blade.php | 12 +- app/views/backend/users/view.blade.php | 30 +- .../frontend/account/change-email.blade.php | 8 +- .../account/change-password.blade.php | 24 +- app/views/frontend/account/profile.blade.php | 22 +- .../auth/forgot-password-confirm.blade.php | 6 +- .../frontend/auth/forgot-password.blade.php | 4 +- app/views/frontend/auth/signin.blade.php | 8 +- app/views/frontend/auth/signup.blade.php | 14 +- app/views/frontend/layouts/account.blade.php | 4 +- app/views/frontend/notifications.blade.php | 20 +- .../css/bootstrap/bootstrap-overrides.css | 169 +- public/assets/css/bootstrap/bootstrap.css | 10592 ++++++++-------- public/assets/css/bootstrap/bootstrap.min.css | 842 +- public/assets/css/compiled/calendar.css | 6 +- public/assets/css/compiled/elements.css | 13 +- public/assets/css/compiled/form-showcase.css | 8 +- public/assets/css/compiled/form-wizard.css | 10 +- public/assets/css/compiled/gallery.css | 118 +- public/assets/css/compiled/grids.css | 3 +- public/assets/css/compiled/index.css | 31 +- public/assets/css/compiled/layout.css | 121 +- public/assets/css/compiled/new-user.css | 12 +- public/assets/css/compiled/personal-info.css | 29 +- public/assets/css/compiled/signin.css | 3 + public/assets/css/compiled/signup.css | 4 +- public/assets/css/compiled/skins/dark.css | 61 - public/assets/css/compiled/tables.css | 8 +- public/assets/css/compiled/ui-elements.css | 12 + public/assets/css/compiled/user-list.css | 14 +- public/assets/css/compiled/user-profile.css | 5 +- .../assets/css/lib/bootstrap.datepicker.css | 3 +- public/assets/css/lib/font-awesome.css | 295 +- public/assets/css/lib/fullcalendar.css | 1 + public/assets/css/lib/jquery.dataTables.css | 24 +- public/assets/css/scss/calendar.scss | 6 +- public/assets/css/scss/elements.scss | 11 +- public/assets/css/scss/form-showcase.scss | 8 +- public/assets/css/scss/form-wizard.scss | 9 +- public/assets/css/scss/gallery.scss | 128 +- public/assets/css/scss/grids.scss | 3 +- public/assets/css/scss/index.scss | 19 +- public/assets/css/scss/layout.scss | 131 +- public/assets/css/scss/new-user.scss | 12 +- public/assets/css/scss/personal-info.scss | 32 +- public/assets/css/scss/signin.scss | 3 + public/assets/css/scss/signup.scss | 4 +- public/assets/css/scss/skins/dark.scss | 55 - public/assets/css/scss/tables.scss | 6 +- public/assets/css/scss/ui-elements.scss | 15 + public/assets/css/scss/user-list.scss | 14 +- public/assets/css/scss/user-profile.scss | 2 +- 87 files changed, 7224 insertions(+), 6696 deletions(-) delete mode 100755 app/storage/logs/.gitignore delete mode 100755 app/storage/views/.gitignore mode change 100644 => 100755 public/assets/css/bootstrap/bootstrap.css mode change 100644 => 100755 public/assets/css/bootstrap/bootstrap.min.css delete mode 100644 public/assets/css/compiled/skins/dark.css delete mode 100644 public/assets/css/scss/skins/dark.scss diff --git a/app/storage/logs/.gitignore b/app/storage/logs/.gitignore deleted file mode 100755 index c96a04f008..0000000000 --- a/app/storage/logs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/app/storage/views/.gitignore b/app/storage/views/.gitignore deleted file mode 100755 index c96a04f008..0000000000 --- a/app/storage/views/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/app/views/backend/categories/edit.blade.php b/app/views/backend/categories/edit.blade.php index 8b471b7cbf..18311ca731 100755 --- a/app/views/backend/categories/edit.blade.php +++ b/app/views/backend/categories/edit.blade.php @@ -31,7 +31,7 @@ -
+
@@ -40,7 +40,7 @@
-
+
@lang('general.cancel') diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php index 34e4cc3508..14309aef10 100755 --- a/app/views/backend/categories/index.blade.php +++ b/app/views/backend/categories/index.blade.php @@ -19,7 +19,7 @@ Asset Categories ::
-
+

@@ -27,8 +27,8 @@ Asset Categories :: - - + + @@ -49,7 +49,7 @@ Asset Categories :: -
+


About Asset Categories

Asset categories help you organize your assets. Some diff --git a/app/views/backend/depreciations/edit.blade.php b/app/views/backend/depreciations/edit.blade.php index b6a026d466..3b5a43920d 100755 --- a/app/views/backend/depreciations/edit.blade.php +++ b/app/views/backend/depreciations/edit.blade.php @@ -39,18 +39,18 @@

-
+
- + {{ $errors->first('name', ':message') }}
-
+
- + {{ $errors->first('months', ':message') }}
@@ -58,7 +58,7 @@ -
+
@lang('general.cancel') diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php index 223c0a9e3a..d7db648bbd 100755 --- a/app/views/backend/depreciations/index.blade.php +++ b/app/views/backend/depreciations/index.blade.php @@ -19,7 +19,7 @@ Asset Depreciations ::
-
+

@@ -27,9 +27,9 @@ Asset Depreciations ::
@lang('admin/categories/table.title')@lang('table.actions')@lang('admin/categories/table.title')@lang('table.actions')
- - - + + + @@ -51,7 +51,7 @@ Asset Depreciations :: -
+


About Asset Depreciations

You can set up asset depreciations to depreciate assets based on straight-line depreciation.

diff --git a/app/views/backend/groups/create.blade.php b/app/views/backend/groups/create.blade.php index d679b61a75..8b61fab30c 100755 --- a/app/views/backend/groups/create.blade.php +++ b/app/views/backend/groups/create.blade.php @@ -33,7 +33,7 @@ Create a Group ::
-
+
@@ -44,7 +44,7 @@ Create a Group ::
-
+
@foreach ($permissions as $area => $permissions) @@ -52,8 +52,8 @@ Create a Group :: {{ $area }} @foreach ($permissions as $permission) -
- +
+
-
+
Cancel diff --git a/app/views/backend/groups/edit.blade.php b/app/views/backend/groups/edit.blade.php index b7135496b7..ed49fbd71e 100755 --- a/app/views/backend/groups/edit.blade.php +++ b/app/views/backend/groups/edit.blade.php @@ -33,7 +33,7 @@ Group Update ::
-
+
@@ -45,15 +45,15 @@ Group Update ::
-
+
@foreach ($permissions as $area => $permissions)
{{ $area }} @foreach ($permissions as $permission) -
- +
+
-
+
@lang('general.cancel') diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php index 50786391dc..9985ddd4bd 100755 --- a/app/views/backend/groups/index.blade.php +++ b/app/views/backend/groups/index.blade.php @@ -23,11 +23,11 @@ Group Management ::
@lang('admin/depreciations/table.title')@lang('admin/depreciations/table.term')@lang('table.actions')@lang('admin/depreciations/table.title')@lang('admin/depreciations/table.term')@lang('table.actions')
- - - - - + + + + + diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php index 0985b49ca6..b96e8c736a 100644 --- a/app/views/backend/hardware/checkin.blade.php +++ b/app/views/backend/hardware/checkin.blade.php @@ -25,32 +25,32 @@ -
+
- +
-
+
- +
-
+
- + {{ $errors->first('note', ' :message') }}
-
+
@lang('general.cancel') diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php index bd7b64bbe0..35e7bbeda1 100644 --- a/app/views/backend/hardware/checkout.blade.php +++ b/app/views/backend/hardware/checkout.blade.php @@ -38,23 +38,23 @@
-
+
- +
-
+
- +
-
+
@@ -64,10 +64,10 @@
-
+
- + {{ $errors->first('note', ' :message') }}
@@ -75,7 +75,7 @@
-
+
@lang('general.cancel') diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php index ca51051fe3..93dc1d4c68 100644 --- a/app/views/backend/hardware/clone.blade.php +++ b/app/views/backend/hardware/clone.blade.php @@ -23,43 +23,43 @@ -
+
- + {{ $errors->first('asset_tag', ' :message') }}
-
+
- + {{ $errors->first('name', ' :message') }}
-
+
- + {{ $errors->first('serial', ' :message') }}
-
+
- + {{ $errors->first('order_number', ' :message') }}
-
+
{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }} @@ -68,7 +68,7 @@
-
+
@@ -78,28 +78,28 @@
-
+
$ - + {{ $errors->first('purchase_cost', ' :message') }}
-
+
- months + months {{ $errors->first('warranty_months', ' :message') }}
-
+
@@ -110,7 +110,7 @@
-
+
@@ -122,16 +122,16 @@ -
+
- + {{ $errors->first('notes', ' :message') }}
-
+
Cancel diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index a7bfa51b33..2d4f8427af 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -11,166 +11,156 @@ @stop {{-- Page content --}} + @section('content') -
@lang('admin/groups/table.id')@lang('admin/groups/table.name')@lang('admin/groups/table.users')@lang('admin/groups/table.created_at')@lang('table.actions')@lang('admin/groups/table.id')@lang('admin/groups/table.name')@lang('admin/groups/table.users')@lang('admin/groups/table.created_at')@lang('table.actions')
- - - + + + @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')) - + @else - - + + @endif - - + + diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php index 4d0835086a..7611405eb3 100644 --- a/app/views/backend/hardware/view.blade.php +++ b/app/views/backend/hardware/view.blade.php @@ -10,67 +10,64 @@ View Asset {{ $asset->asset_tag }} :: @section('content')
@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')StatusStatus@lang('admin/hardware/table.checkoutto')@lang('admin/hardware/table.location')@lang('admin/hardware/table.checkoutto')@lang('admin/hardware/table.location')@lang('admin/hardware/table.change')@lang('table.actions')@lang('admin/hardware/table.change')@lang('table.actions')
- - - - - - + + + + + + @@ -143,7 +140,7 @@ View Asset {{ $asset->asset_tag }} :: -
+
@if ((isset($asset->assigned_to ) && ($asset->assigned_to > 0)))

Checked Out To:
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 17420cc415..7f4c08326d 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -17,21 +17,22 @@ - + + - + @@ -66,60 +67,69 @@ + +
+ @if (Sentry::check()) - +
DateAdminActionUserNoteDateAdminActionUserNote
- - - - + + + + diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php index 7010483c59..1ef4e9c6c3 100644 --- a/app/views/backend/licenses/view.blade.php +++ b/app/views/backend/licenses/view.blade.php @@ -10,28 +10,29 @@ View License {{ $license->name }} :: @section('content')
@lang('admin/licenses/table.title')@lang('admin/licenses/table.serial')@lang('admin/licenses/table.assigned_to')@lang('table.actions')@lang('admin/licenses/table.title')@lang('admin/licenses/table.serial')@lang('admin/licenses/table.assigned_to')@lang('table.actions')
- - - + + + @@ -55,7 +56,7 @@ View License {{ $license->name }} :: \s*$/g,At={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"
SeatUserSeatUser
Seat {{ $count }} @if ($licensedto->assigned_to) - + {{ $licensedto->user->fullName() }} @endif @@ -82,12 +83,12 @@ View License {{ $license->name }} :: - - - - - - + + + + + + @@ -108,9 +109,10 @@ View License {{ $license->name }} :: @@ -145,7 +147,7 @@ View License {{ $license->name }} :: -
+

License Info:
    @if ($license->serial) diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php index f43a0923a6..df42cd7e6f 100755 --- a/app/views/backend/locations/edit.blade.php +++ b/app/views/backend/locations/edit.blade.php @@ -15,11 +15,6 @@ {{-- Page content --}} @section('content') @@ -41,55 +38,55 @@
    -
    +
    - + {{ $errors->first('name', ':message') }}
    -
    +
    - + {{ $errors->first('address', ':message') }}
    -
    +
    - + {{ $errors->first('address2', ':message') }}
    -
    +
    - + {{ $errors->first('city', ':message') }}
    -
    +
    - + {{ $errors->first('state', ':message') }}
    -
    +
    - + {{ $errors->first('zip', ':message') }}
    -
    +
    - + {{ $errors->first('country', ':message') }}
    @@ -97,7 +94,7 @@ -
    +
    @lang('general.cancel') diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index 9afaf8c75b..d736ce240a 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -21,12 +21,12 @@ Locations ::
DateAdminActionUserNoteDateAdminActionUserNote
{{ $log->action_type }} - @if (($log->checkedout_to) && ($log->checkedout_to > 0 )) + @if (isset($log->checkedout_to)) - {{ $log->userlog->fullName() }} + {{ $log->userlog->fullName() }} + @endif
- - - + + - + diff --git a/app/views/backend/manufacturers/edit.blade.php b/app/views/backend/manufacturers/edit.blade.php index 5a1f29cc69..b5601338cb 100755 --- a/app/views/backend/manufacturers/edit.blade.php +++ b/app/views/backend/manufacturers/edit.blade.php @@ -13,11 +13,6 @@ {{-- Page content --}} @section('content') @@ -38,7 +36,7 @@
-
+
@@ -49,7 +47,7 @@
-
+
@lang('general.cancel') diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php index 45ad2d4e45..252b90dbd2 100755 --- a/app/views/backend/manufacturers/index.blade.php +++ b/app/views/backend/manufacturers/index.blade.php @@ -22,8 +22,8 @@ Asset Manufacturers ::
@lang('admin/locations/table.name')Address@lang('admin/locations/table.city'), + @lang('admin/locations/table.name')Address@lang('admin/locations/table.city'), @lang('admin/locations/table.state') @lang('admin/locations/table.country')@lang('table.actions')@lang('table.actions')
- - + + diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php index d679f63e22..c106733fb3 100755 --- a/app/views/backend/models/edit.blade.php +++ b/app/views/backend/models/edit.blade.php @@ -13,16 +13,16 @@ {{-- Page content --}} @section('content') @@ -34,7 +34,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
{{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $model->manufacturer_id), array('class'=>'select2', 'style'=>'width:250px')) }} @@ -60,7 +60,7 @@
-
+
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $model->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }} @@ -69,7 +69,7 @@
-
+
{{ Form::select('category_id', $category_list , Input::old('category_id', $model->category_id), array('class'=>'select2', 'style'=>'width:250px')) }} @@ -81,7 +81,7 @@
-
+
@lang('general.cancel') diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index 1efaef40c2..3d07be6314 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -20,12 +20,12 @@ Asset Models ::
@lang('admin/manufacturers/table.title')@lang('table.actions')@lang('admin/manufacturers/table.title')@lang('table.actions')
- - - - - - + + + + + + diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php index 8492fd7359..776413424b 100644 --- a/app/views/backend/models/view.blade.php +++ b/app/views/backend/models/view.blade.php @@ -25,7 +25,7 @@ View Model {{ $model->model_tag }} ::
-
+

@@ -33,10 +33,10 @@ View Model {{ $model->model_tag }} ::
@lang('admin/models/table.title')@lang('admin/models/table.modelnumber')@lang('admin/models/table.numassets')DepreciationCategory@lang('table.actions')@lang('admin/models/table.title')@lang('admin/models/table.modelnumber')@lang('admin/models/table.numassets')DepreciationCategory@lang('table.actions')
- - - - + + + + @@ -80,7 +80,7 @@ View Model {{ $model->model_tag }} :: -
+

More Info:
    diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php index f7cf766dea..277c74753e 100644 --- a/app/views/backend/reports/index.blade.php +++ b/app/views/backend/reports/index.blade.php @@ -28,20 +28,20 @@ Depreciation Report

    Depreciation Report

- -
+
+
NameAsset TagUserActionsNameAsset TagUserActions
- - - - - - - - - + + + + + + + + + diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php index 6960910572..daaf6d2612 100755 --- a/app/views/backend/settings/edit.blade.php +++ b/app/views/backend/settings/edit.blade.php @@ -20,7 +20,7 @@
-
+

@@ -31,17 +31,17 @@ @foreach ($settings as $setting) -
+
- + {{ $errors->first('site_name', ':message') }}
-
+
- + {{ $errors->first('per_page', ':message') }}
@@ -51,7 +51,7 @@ @endforeach -
+
@lang('general.cancel') @@ -63,7 +63,7 @@
-
+


These settings let you customize certain aspects of your installation.

diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php index 83b05b651e..c95f9d02b9 100755 --- a/app/views/backend/settings/index.blade.php +++ b/app/views/backend/settings/index.blade.php @@ -21,7 +21,7 @@ Settings ::
-
+

@@ -29,8 +29,8 @@ Settings ::
@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')@lang('admin/hardware/table.checkoutto')@lang('admin/hardware/table.location')@lang('admin/hardware/table.purchase_date')@lang('admin/hardware/table.purchase_cost')@lang('admin/hardware/table.book_value')Diff@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')@lang('admin/hardware/table.checkoutto')@lang('admin/hardware/table.location')@lang('admin/hardware/table.purchase_date')@lang('admin/hardware/table.purchase_cost')@lang('admin/hardware/table.book_value')Diff
- - + + @@ -51,7 +51,7 @@ Settings :: -
+


These settings let you customize certain aspects of your installation.

diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php index 8ad60e5634..c4ee736603 100755 --- a/app/views/backend/statuslabels/edit.blade.php +++ b/app/views/backend/statuslabels/edit.blade.php @@ -29,7 +29,7 @@
-
+

@@ -38,16 +38,16 @@ -
+
- + {{ $errors->first('name', ':message') }}
-
+
@lang('general.cancel') @@ -59,7 +59,7 @@
-
+


About Status Labels

Status labels are used to describe the various reasons why an asset cannot be deployed.

diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php index d50d5f41a8..08ac61983a 100755 --- a/app/views/backend/statuslabels/index.blade.php +++ b/app/views/backend/statuslabels/index.blade.php @@ -19,7 +19,7 @@ Status Labels
-
+

@@ -27,8 +27,8 @@ Status Labels
SettingValueSettingValue
- - + + @@ -48,7 +48,7 @@ Status Labels -
+


About Status Labels

Status labels are used to describe the various reasons why an asset cannot be deployed.

diff --git a/app/views/backend/users/create.blade.php b/app/views/backend/users/create.blade.php index 0e8ed78fdf..374c85991a 100755 --- a/app/views/backend/users/create.blade.php +++ b/app/views/backend/users/create.blade.php @@ -34,7 +34,7 @@ Create a User ::
-
+
@@ -43,7 +43,7 @@ Create a User ::
-
+
@@ -52,7 +52,7 @@ Create a User ::
-
+
@@ -61,7 +61,7 @@ Create a User ::
-
+
@@ -72,7 +72,7 @@ Create a User ::
-
+
@@ -81,7 +81,7 @@ Create a User ::
-
+
@@ -90,7 +90,7 @@ Create a User ::
-
+
@@ -99,7 +99,7 @@ Create a User ::
-
+
@@ -108,7 +108,7 @@ Create a User ::
-
+
@@ -138,7 +138,7 @@ Create a User ::
-
+
@foreach ($permissions as $area => $permissions) @@ -146,8 +146,8 @@ Create a User :: {{ $area }} @foreach ($permissions as $permission) -
- +
+
-
+
Cancel diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php index 8d84d7ddf8..efacdbe52c 100755 --- a/app/views/backend/users/edit.blade.php +++ b/app/views/backend/users/edit.blade.php @@ -33,7 +33,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -42,7 +42,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -51,7 +51,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -60,7 +60,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -71,7 +71,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -81,7 +81,7 @@ Update User {{ $user->fullName() }} :: -
+
@@ -90,7 +90,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -99,7 +99,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -108,7 +108,7 @@ Update User {{ $user->fullName() }} ::
-
+
id === Sentry::getId() ? ' disabled="disabled"' : '') }} name="activated" id="activated"> @@ -120,7 +120,7 @@ Update User {{ $user->fullName() }} ::
-
+
@lang('admin/statuslabels/table.name')@lang('table.actions')@lang('admin/statuslabels/table.name')@lang('table.actions')
- - - - - - + + + + + + diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php index 848f04b015..92311dced9 100644 --- a/app/views/backend/users/view.blade.php +++ b/app/views/backend/users/view.blade.php @@ -11,7 +11,7 @@ View User {{ $user->fullName() }} ::
@lang('admin/users/table.name')@lang('admin/users/table.email')AssetsLicenses@lang('admin/users/table.activated')@lang('table.actions')@lang('admin/users/table.name')@lang('admin/users/table.email')AssetsLicenses@lang('admin/users/table.activated')@lang('table.actions')
- - - - + + + + @@ -74,10 +74,10 @@ View User {{ $user->fullName() }} ::
Asset TypeAsset TagNameActionsAsset TypeAsset TagNameActions
- - - - + + + + @@ -117,10 +117,10 @@ View User {{ $user->fullName() }} ::
Asset TypeSerialNameActionsAsset TypeSerialNameActions
- - - - + + + + @@ -156,7 +156,7 @@ View User {{ $user->fullName() }} :: -
+
Contact {{ $user->first_name }}
diff --git a/app/views/frontend/account/change-email.blade.php b/app/views/frontend/account/change-email.blade.php index d834dde848..199273cda5 100755 --- a/app/views/frontend/account/change-email.blade.php +++ b/app/views/frontend/account/change-email.blade.php @@ -19,7 +19,7 @@ Change your Email -
+
@@ -28,7 +28,7 @@ Change your Email
-
+
@@ -37,7 +37,7 @@ Change your Email
-
+
@@ -48,7 +48,7 @@ Change your Email
-
+
diff --git a/app/views/frontend/account/change-password.blade.php b/app/views/frontend/account/change-password.blade.php index a48d15825d..edf904662d 100755 --- a/app/views/frontend/account/change-password.blade.php +++ b/app/views/frontend/account/change-password.blade.php @@ -16,28 +16,26 @@ Change your Password -
+
-
- + {{ $errors->first('old_password', ':message') }} -
-
+
- + {{ $errors->first('password', ':message') }}
-
+
- + {{ $errors->first('password_confirm', ':message') }}
@@ -45,7 +43,7 @@ Change your Password
-
+
@@ -78,7 +76,7 @@ Change your Password -
+
@@ -87,7 +85,7 @@ Change your Password
-
+
@@ -96,7 +94,7 @@ Change your Password
-
+
@@ -105,7 +103,7 @@ Change your Password
-
+
Cancel diff --git a/app/views/frontend/account/profile.blade.php b/app/views/frontend/account/profile.blade.php index b821b2c80b..36ed3527c1 100755 --- a/app/views/frontend/account/profile.blade.php +++ b/app/views/frontend/account/profile.blade.php @@ -16,46 +16,46 @@ Your Profile -
+
- + {{ $errors->first('first_name', ':message') }}
-
+
- + {{ $errors->first('last_name', ':message') }}
-
+
- + {{ $errors->first('website', ':message') }}
-
+
- + {{ $errors->first('country', ':message') }}
-
+
- + {{ $errors->first('gravatar', ':message') }}
@@ -68,7 +68,7 @@ Your Profile
-
+
diff --git a/app/views/frontend/auth/forgot-password-confirm.blade.php b/app/views/frontend/auth/forgot-password-confirm.blade.php index 8ed5a8bf72..e33d90534f 100755 --- a/app/views/frontend/auth/forgot-password-confirm.blade.php +++ b/app/views/frontend/auth/forgot-password-confirm.blade.php @@ -16,7 +16,7 @@ Forgot Password :: -
+
@@ -25,7 +25,7 @@ Forgot Password ::
-
+
@@ -34,7 +34,7 @@ Forgot Password ::
-
+
Cancel diff --git a/app/views/frontend/auth/forgot-password.blade.php b/app/views/frontend/auth/forgot-password.blade.php index bf4453cece..9353c71add 100755 --- a/app/views/frontend/auth/forgot-password.blade.php +++ b/app/views/frontend/auth/forgot-password.blade.php @@ -16,7 +16,7 @@ Forgot Password :: -
+
@@ -25,7 +25,7 @@ Forgot Password ::
-
+
Cancel diff --git a/app/views/frontend/auth/signin.blade.php b/app/views/frontend/auth/signin.blade.php index b44b666d50..f26db70eca 100755 --- a/app/views/frontend/auth/signin.blade.php +++ b/app/views/frontend/auth/signin.blade.php @@ -17,7 +17,7 @@ Account Sign in :: -
+
@@ -26,7 +26,7 @@ Account Sign in ::
-
+
@@ -35,7 +35,7 @@ Account Sign in ::
-
+
- - + + @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')) @else @@ -110,14 +110,14 @@ Assets :: @endforeach @@ -132,6 +132,7 @@ Assets :: + @endif diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 7f4c08326d..f0f6efe088 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -11,22 +11,21 @@ - + + - - - + + @@ -38,15 +37,14 @@ + + - - - @@ -81,52 +79,8 @@ {{ Setting::getSettings()->site_name }} - - '; - while (dowCnt < this.weekStart + 7) { - html += ''; - } - html += ''; - this.picker.find('.datepicker-days thead').append(html); - }, - - fillMonths: function(){ - var html = '', - i = 0; - while (i < 12) { - html += ''+dates[this.language].monthsShort[i++]+''; - } - this.picker.find('.datepicker-months td').html(html); - }, - - fill: function() { - var d = new Date(this.viewDate), - year = d.getUTCFullYear(), - month = d.getUTCMonth(), - startYear = this.startDate !== -Infinity ? this.startDate.getUTCFullYear() : -Infinity, - startMonth = this.startDate !== -Infinity ? this.startDate.getUTCMonth() : -Infinity, - endYear = this.endDate !== Infinity ? this.endDate.getUTCFullYear() : Infinity, - endMonth = this.endDate !== Infinity ? this.endDate.getUTCMonth() : Infinity, - currentDate = this.date && this.date.valueOf(), - today = new Date(); - this.picker.find('.datepicker-days thead th:eq(1)') - .text(dates[this.language].months[month]+' '+year); - this.picker.find('tfoot th.today') - .text(dates[this.language].today) - .toggle(this.todayBtn !== false); - this.updateNavArrows(); - this.fillMonths(); - var prevMonth = UTCDate(year, month-1, 28,0,0,0,0), - day = DPGlobal.getDaysInMonth(prevMonth.getUTCFullYear(), prevMonth.getUTCMonth()); - prevMonth.setUTCDate(day); - prevMonth.setUTCDate(day - (prevMonth.getUTCDay() - this.weekStart + 7)%7); - var nextMonth = new Date(prevMonth); - nextMonth.setUTCDate(nextMonth.getUTCDate() + 42); - nextMonth = nextMonth.valueOf(); - var html = []; - var clsName; - while(prevMonth.valueOf() < nextMonth) { - if (prevMonth.getUTCDay() == this.weekStart) { - html.push(''); - } - clsName = ''; - if (prevMonth.getUTCFullYear() < year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() < month)) { - clsName += ' old'; - } else if (prevMonth.getUTCFullYear() > year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) { - clsName += ' new'; - } - // Compare internal UTC date with local today, not UTC today - if (this.todayHighlight && - prevMonth.getUTCFullYear() == today.getFullYear() && - prevMonth.getUTCMonth() == today.getMonth() && - prevMonth.getUTCDate() == today.getDate()) { - clsName += ' today'; - } - if (currentDate && prevMonth.valueOf() == currentDate) { - clsName += ' active'; - } - if (prevMonth.valueOf() < this.startDate || prevMonth.valueOf() > this.endDate || - $.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1) { - clsName += ' disabled'; - } - html.push(''); - if (prevMonth.getUTCDay() == this.weekEnd) { - html.push(''); - } - prevMonth.setUTCDate(prevMonth.getUTCDate()+1); - } - this.picker.find('.datepicker-days tbody').empty().append(html.join('')); - var currentYear = this.date && this.date.getUTCFullYear(); - - var months = this.picker.find('.datepicker-months') - .find('th:eq(1)') - .text(year) - .end() - .find('span').removeClass('active'); - if (currentYear && currentYear == year) { - months.eq(this.date.getUTCMonth()).addClass('active'); - } - if (year < startYear || year > endYear) { - months.addClass('disabled'); - } - if (year == startYear) { - months.slice(0, startMonth).addClass('disabled'); - } - if (year == endYear) { - months.slice(endMonth+1).addClass('disabled'); - } - - html = ''; - year = parseInt(year/10, 10) * 10; - var yearCont = this.picker.find('.datepicker-years') - .find('th:eq(1)') - .text(year + '-' + (year + 9)) - .end() - .find('td'); - year -= 1; - for (var i = -1; i < 11; i++) { - html += ''+year+''; - year += 1; - } - yearCont.html(html); - }, - - updateNavArrows: function() { - var d = new Date(this.viewDate), - year = d.getUTCFullYear(), - month = d.getUTCMonth(); - switch (this.viewMode) { - case 0: - if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear() && month <= this.startDate.getUTCMonth()) { - this.picker.find('.prev').css({visibility: 'hidden'}); - } else { - this.picker.find('.prev').css({visibility: 'visible'}); - } - if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear() && month >= this.endDate.getUTCMonth()) { - this.picker.find('.next').css({visibility: 'hidden'}); - } else { - this.picker.find('.next').css({visibility: 'visible'}); - } - break; - case 1: - case 2: - if (this.startDate !== -Infinity && year <= this.startDate.getUTCFullYear()) { - this.picker.find('.prev').css({visibility: 'hidden'}); - } else { - this.picker.find('.prev').css({visibility: 'visible'}); - } - if (this.endDate !== Infinity && year >= this.endDate.getUTCFullYear()) { - this.picker.find('.next').css({visibility: 'hidden'}); - } else { - this.picker.find('.next').css({visibility: 'visible'}); - } - break; - } - }, - - click: function(e) { - e.stopPropagation(); - e.preventDefault(); - var target = $(e.target).closest('span, td, th'); - if (target.length == 1) { - switch(target[0].nodeName.toLowerCase()) { - case 'th': - switch(target[0].className) { - case 'switch': - this.showMode(1); - break; - case 'prev': - case 'next': - var dir = DPGlobal.modes[this.viewMode].navStep * (target[0].className == 'prev' ? -1 : 1); - switch(this.viewMode){ - case 0: - this.viewDate = this.moveMonth(this.viewDate, dir); - break; - case 1: - case 2: - this.viewDate = this.moveYear(this.viewDate, dir); - break; - } - this.fill(); - break; - case 'today': - var date = new Date(); - date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0); - - this.showMode(-2); - var which = this.todayBtn == 'linked' ? null : 'view'; - this._setDate(date, which); - break; - } - break; - case 'span': - if (!target.is('.disabled')) { - this.viewDate.setUTCDate(1); - if (target.is('.month')) { - var month = target.parent().find('span').index(target); - this.viewDate.setUTCMonth(month); - this.element.trigger({ - type: 'changeMonth', - date: this.viewDate - }); - } else { - var year = parseInt(target.text(), 10)||0; - this.viewDate.setUTCFullYear(year); - this.element.trigger({ - type: 'changeYear', - date: this.viewDate - }); - } - this.showMode(-1); - this.fill(); - } - break; - case 'td': - if (target.is('.day') && !target.is('.disabled')){ - var day = parseInt(target.text(), 10)||1; - var year = this.viewDate.getUTCFullYear(), - month = this.viewDate.getUTCMonth(); - if (target.is('.old')) { - if (month === 0) { - month = 11; - year -= 1; - } else { - month -= 1; - } - } else if (target.is('.new')) { - if (month == 11) { - month = 0; - year += 1; - } else { - month += 1; - } - } - this._setDate(UTCDate(year, month, day,0,0,0,0)); - } - break; - } - } - }, - - _setDate: function(date, which){ - if (!which || which == 'date') - this.date = date; - if (!which || which == 'view') - this.viewDate = date; - this.fill(); - this.setValue(); - this.element.trigger({ - type: 'changeDate', - date: this.date - }); - var element; - if (this.isInput) { - element = this.element; - } else if (this.component){ - element = this.element.find('input'); - } - if (element) { - element.change(); - if (this.autoclose && (!which || which == 'date')) { - this.hide(); - } - } - }, - - moveMonth: function(date, dir){ - if (!dir) return date; - var new_date = new Date(date.valueOf()), - day = new_date.getUTCDate(), - month = new_date.getUTCMonth(), - mag = Math.abs(dir), - new_month, test; - dir = dir > 0 ? 1 : -1; - if (mag == 1){ - test = dir == -1 - // If going back one month, make sure month is not current month - // (eg, Mar 31 -> Feb 31 == Feb 28, not Mar 02) - ? function(){ return new_date.getUTCMonth() == month; } - // If going forward one month, make sure month is as expected - // (eg, Jan 31 -> Feb 31 == Feb 28, not Mar 02) - : function(){ return new_date.getUTCMonth() != new_month; }; - new_month = month + dir; - new_date.setUTCMonth(new_month); - // Dec -> Jan (12) or Jan -> Dec (-1) -- limit expected date to 0-11 - if (new_month < 0 || new_month > 11) - new_month = (new_month + 12) % 12; - } else { - // For magnitudes >1, move one month at a time... - for (var i=0; i= this.startDate && date <= this.endDate; - }, - - keydown: function(e){ - if (this.picker.is(':not(:visible)')){ - if (e.keyCode == 27) // allow escape to hide and re-show picker - this.show(); - return; - } - var dateChanged = false, - dir, day, month, - newDate, newViewDate; - switch(e.keyCode){ - case 27: // escape - this.hide(); - e.preventDefault(); - break; - case 37: // left - case 39: // right - if (!this.keyboardNavigation) break; - dir = e.keyCode == 37 ? -1 : 1; - if (e.ctrlKey){ - newDate = this.moveYear(this.date, dir); - newViewDate = this.moveYear(this.viewDate, dir); - } else if (e.shiftKey){ - newDate = this.moveMonth(this.date, dir); - newViewDate = this.moveMonth(this.viewDate, dir); - } else { - newDate = new Date(this.date); - newDate.setUTCDate(this.date.getUTCDate() + dir); - newViewDate = new Date(this.viewDate); - newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir); - } - if (this.dateWithinRange(newDate)){ - this.date = newDate; - this.viewDate = newViewDate; - this.setValue(); - this.update(); - e.preventDefault(); - dateChanged = true; - } - break; - case 38: // up - case 40: // down - if (!this.keyboardNavigation) break; - dir = e.keyCode == 38 ? -1 : 1; - if (e.ctrlKey){ - newDate = this.moveYear(this.date, dir); - newViewDate = this.moveYear(this.viewDate, dir); - } else if (e.shiftKey){ - newDate = this.moveMonth(this.date, dir); - newViewDate = this.moveMonth(this.viewDate, dir); - } else { - newDate = new Date(this.date); - newDate.setUTCDate(this.date.getUTCDate() + dir * 7); - newViewDate = new Date(this.viewDate); - newViewDate.setUTCDate(this.viewDate.getUTCDate() + dir * 7); - } - if (this.dateWithinRange(newDate)){ - this.date = newDate; - this.viewDate = newViewDate; - this.setValue(); - this.update(); - e.preventDefault(); - dateChanged = true; - } - break; - case 13: // enter - this.hide(); - e.preventDefault(); - break; - case 9: // tab - this.hide(); - break; - } - if (dateChanged){ - this.element.trigger({ - type: 'changeDate', - date: this.date - }); - var element; - if (this.isInput) { - element = this.element; - } else if (this.component){ - element = this.element.find('input'); - } - if (element) { - element.change(); - } - } - }, - - showMode: function(dir) { - if (dir) { - this.viewMode = Math.max(0, Math.min(2, this.viewMode + dir)); - } - /* - vitalets: fixing bug of very special conditions: - jquery 1.7.1 + webkit + show inline datepicker in bootstrap popover. - Method show() does not set display css correctly and datepicker is not shown. - Changed to .css('display', 'block') solve the problem. - See https://github.com/vitalets/x-editable/issues/37 - - In jquery 1.7.2+ everything works fine. - */ - //this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show(); - this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).css('display', 'block'); - this.updateNavArrows(); - } - }; - - $.fn.datepicker = function ( option ) { - var args = Array.apply(null, arguments); - args.shift(); - return this.each(function () { - var $this = $(this), - data = $this.data('datepicker'), - options = typeof option == 'object' && option; - if (!data) { - $this.data('datepicker', (data = new Datepicker(this, $.extend({}, $.fn.datepicker.defaults,options)))); - } - if (typeof option == 'string' && typeof data[option] == 'function') { - data[option].apply(data, args); - } - }); - }; - - $.fn.datepicker.defaults = { - }; - $.fn.datepicker.Constructor = Datepicker; - var dates = $.fn.datepicker.dates = { - en: { - days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], - daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], - daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"], - months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], - monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], - today: "Today" - } - }; - - var DPGlobal = { - modes: [ - { - clsName: 'days', - navFnc: 'Month', - navStep: 1 - }, - { - clsName: 'months', - navFnc: 'FullYear', - navStep: 1 - }, - { - clsName: 'years', - navFnc: 'FullYear', - navStep: 10 - }], - isLeapYear: function (year) { - return (((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0)); - }, - getDaysInMonth: function (year, month) { - return [31, (DPGlobal.isLeapYear(year) ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]; - }, - validParts: /dd?|DD?|mm?|MM?|yy(?:yy)?/g, - nonpunctuation: /[^ -\/:-@\[\u3400-\u9fff-`{-~\t\n\r]+/g, - parseFormat: function(format){ - // IE treats \0 as a string end in inputs (truncating the value), - // so it's a bad format delimiter, anyway - var separators = format.replace(this.validParts, '\0').split('\0'), - parts = format.match(this.validParts); - if (!separators || !separators.length || !parts || parts.length === 0){ - throw new Error("Invalid date format."); - } - return {separators: separators, parts: parts}; - }, - parseDate: function(date, format, language) { - if (date instanceof Date) return date; - if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)) { - var part_re = /([\-+]\d+)([dmwy])/, - parts = date.match(/([\-+]\d+)([dmwy])/g), - part, dir; - date = new Date(); - for (var i=0; i'+ - ''+ - ''+ - ''+ - ''+ - ''+ - '', - contTemplate: '', - footTemplate: '' - }; - DPGlobal.template = '
'+ - '
'+ - '
DateActionAssetByDateActionAssetBy
@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')Status @if ($asset->assigned_to != 0) - Checkin + Checkin @else - Checkout + Checkout @endif - @lang('button.edit') - @lang('button.delete') + +
'+dates[this.language].daysMin[(dowCnt++)%7]+'
'+prevMonth.getUTCDate() + '
'+ - DPGlobal.headTemplate+ - ''+ - DPGlobal.footTemplate+ - '
'+ - ''+ - '
'+ - ''+ - DPGlobal.headTemplate+ - DPGlobal.contTemplate+ - DPGlobal.footTemplate+ - '
'+ - '
'+ - '
'+ - ''+ - DPGlobal.headTemplate+ - DPGlobal.contTemplate+ - DPGlobal.footTemplate+ - '
'+ - '
'+ - ''; - - $.fn.datepicker.DPGlobal = DPGlobal; - -}( window.jQuery ); diff --git a/public/assets/js/bootstrap-wysihtml5-0.0.2.js b/public/assets/js/bootstrap-wysihtml5-0.0.2.js deleted file mode 100644 index 4e3c636fdf..0000000000 --- a/public/assets/js/bootstrap-wysihtml5-0.0.2.js +++ /dev/null @@ -1,299 +0,0 @@ -!function($, wysi) { - "use strict" - - var templates = { - "font-styles": "
", - "emphasis": "
  • " + - "
    " - + "Bold" - + "Italic" - //,+ "Underline" - + "
    " - + "
  • ", - "lists": "
  • " - + "
    " - + "" - + "" - + "" - + "" - + "
    " - + "
  • ", - - "link": "
  • " - - + "" - - + "" - - + "
  • ", - - "image": "
  • " - - + "" - - + "" - - + "
  • ", - - "html": - "
  • " - + "
    " - + "" - + "
    " - + "
  • " - }; - - var defaultOptions = { - "font-styles": true, - "emphasis": true, - "lists": true, - "html": false, - "link": true, - "image": true, - events: {}, - parserRules: { - tags: { - "b": {}, - "i": {}, - "br": {}, - "ol": {}, - "ul": {}, - "li": {}, - "h1": {}, - "h2": {}, - "u": 1, - "img": { - "check_attributes": { - "width": "numbers", - "alt": "alt", - "src": "url", - "height": "numbers" - } - }, - "a": { - set_attributes: { - target: "_blank", - rel: "nofollow" - }, - check_attributes: { - href: "url" // important to avoid XSS - } - } - } - } - }; - - var Wysihtml5 = function(el, options) { - this.el = el; - this.toolbar = this.createToolbar(el, options || defaultOptions); - this.editor = this.createEditor(options); - - window.editor = this.editor; - - $('iframe.wysihtml5-sandbox').each(function(i, el){ - $(el.contentWindow).off('focus.wysihtml5').on({ - 'focus.wysihtml5' : function(){ - $('li.dropdown').removeClass('open'); - } - }); - }); - }; - - Wysihtml5.prototype = { - constructor: Wysihtml5, - - createEditor: function(options) { - var parserRules = defaultOptions.parserRules; - - if(options && options.parserRules) { - parserRules = options.parserRules; - } - - var editor = new wysi.Editor(this.el.attr('id'), { - toolbar: this.toolbar.attr('id'), - parserRules: parserRules - }); - - if(options && options.events) { - for(var eventName in options.events) { - editor.on(eventName, options.events[eventName]); - } - } - - return editor; - }, - - createToolbar: function(el, options) { - var self = this; - var toolbar = $("
      ", { - 'id' : el.attr('id') + "-wysihtml5-toolbar", - 'class' : "wysihtml5-toolbar", - 'style': "display:none" - }); - - for(var key in defaultOptions) { - var value = false; - - if(options[key] != undefined) { - if(options[key] == true) { - value = true; - } - } else { - value = defaultOptions[key]; - } - - if(value == true) { - toolbar.append(templates[key]); - - if(key == "html") { - this.initHtml(toolbar); - } - - if(key == "link") { - this.initInsertLink(toolbar); - } - - if(key == "image") { - this.initInsertImage(toolbar); - } - } - } - - var self = this; - - toolbar.find("a[data-wysihtml5-command='formatBlock']").click(function(e) { - var el = $(e.srcElement); - self.toolbar.find('.current-font').text(el.html()) - }); - - this.el.before(toolbar); - - return toolbar; - }, - - initHtml: function(toolbar) { - var changeViewSelector = "a[data-wysihtml5-action='change_view']"; - toolbar.find(changeViewSelector).click(function(e) { - toolbar.find('a.btn').not(changeViewSelector).toggleClass('disabled'); - }); - }, - - initInsertImage: function(toolbar) { - var self = this; - var insertImageModal = toolbar.find('.bootstrap-wysihtml5-insert-image-modal'); - var urlInput = insertImageModal.find('.bootstrap-wysihtml5-insert-image-url'); - var insertButton = insertImageModal.find('a.btn-primary'); - var initialValue = urlInput.val(); - - var insertImage = function() { - var url = urlInput.val(); - urlInput.val(initialValue); - self.editor.composer.commands.exec("insertImage", url); - }; - - urlInput.keypress(function(e) { - if(e.which == 13) { - insertImage(); - insertImageModal.modal('hide'); - } - }); - - insertButton.click(insertImage); - - insertImageModal.on('shown', function() { - urlInput.focus(); - }); - - insertImageModal.on('hide', function() { - self.editor.currentView.element.focus(); - }); - - toolbar.find('a[data-wysihtml5-command=insertImage]').click(function() { - insertImageModal.modal('show'); - }); - }, - - initInsertLink: function(toolbar) { - var self = this; - var insertLinkModal = toolbar.find('.bootstrap-wysihtml5-insert-link-modal'); - var urlInput = insertLinkModal.find('.bootstrap-wysihtml5-insert-link-url'); - var insertButton = insertLinkModal.find('a.btn-primary'); - var initialValue = urlInput.val(); - - var insertLink = function() { - var url = urlInput.val(); - urlInput.val(initialValue); - self.editor.composer.commands.exec("createLink", { - href: url, - target: "_blank", - rel: "nofollow" - }); - }; - var pressedEnter = false; - - urlInput.keypress(function(e) { - if(e.which == 13) { - insertLink(); - insertLinkModal.modal('hide'); - } - }); - - insertButton.click(insertLink); - - insertLinkModal.on('shown', function() { - urlInput.focus(); - }); - - insertLinkModal.on('hide', function() { - self.editor.currentView.element.focus(); - }); - - toolbar.find('a[data-wysihtml5-command=createLink]').click(function() { - insertLinkModal.modal('show'); - }); - } - }; - - $.fn.wysihtml5 = function (options) { - return this.each(function () { - var $this = $(this); - $this.data('wysihtml5', new Wysihtml5($this, options)); - }) - }; - - $.fn.wysihtml5.Constructor = Wysihtml5; - -}(window.jQuery, window.wysihtml5); diff --git a/public/assets/js/bootstrap.js b/public/assets/js/bootstrap.js old mode 100644 new mode 100755 index c298ee42e3..a6bf193f08 --- a/public/assets/js/bootstrap.js +++ b/public/assets/js/bootstrap.js @@ -1,8 +1,8 @@ -/* =================================================== - * bootstrap-transition.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. +/* ======================================================================== + * Bootstrap: alert.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#alerts + * ======================================================================== + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,125 +15,65 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * ========================================================== */ + * ======================================================================== */ -!function ($) { ++function ($) { "use strict"; - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $(function () { - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ + // ALERT CLASS DEFINITION + // ====================== var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent + var $this = $(this) + var selector = $this.attr('data-target') if (!selector) { selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 } - $parent = $(selector) + var $parent = $(selector) - e && e.preventDefault() + if (e) e.preventDefault() - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } - $parent.trigger(e = $.Event('close')) + $parent.trigger(e = $.Event('close.bs.alert')) if (e.isDefaultPrevented()) return $parent.removeClass('in') function removeElement() { - $parent - .trigger('closed') - .remove() + $parent.trigger('closed.bs.alert').remove() } $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : + $parent + .one($.support.transition.end, removeElement) + .emulateTransitionEnd(150) : removeElement() } - /* ALERT PLUGIN DEFINITION - * ======================= */ + // ALERT PLUGIN DEFINITION + // ======================= var old = $.fn.alert $.fn.alert = function (option) { return this.each(function () { var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) if (typeof option == 'string') data[option].call($this) }) } @@ -141,8 +81,8 @@ $.fn.alert.Constructor = Alert - /* ALERT NO CONFLICT - * ================= */ + // ALERT NO CONFLICT + // ================= $.fn.alert.noConflict = function () { $.fn.alert = old @@ -150,16 +90,18 @@ } - /* ALERT DATA-API - * ============== */ + // ALERT DATA-API + // ============== - $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) -}(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: button.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#buttons + * ======================================================================== + * Copyright 2013 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -172,30 +114,32 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * ============================================================ */ + * ======================================================================== */ -!function ($) { ++function ($) { "use strict"; - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ + // BUTTON PUBLIC CLASS DEFINITION + // ============================== var Button = function (element, options) { this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) + this.options = $.extend({}, Button.DEFAULTS, options) + } + + Button.DEFAULTS = { + loadingText: 'loading...' } Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) + + if (!data.resetText) $el.data('resetText', $el[val]()) $el[val](data[state] || this.options[state]) @@ -203,46 +147,47 @@ setTimeout(function () { state == 'loadingText' ? $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) + $el.removeClass(d).removeAttr(d); }, 0) } Button.prototype.toggle = function () { - var $parent = this.$element.closest('[data-toggle="buttons-radio"]') + var $parent = this.$element.closest('[data-toggle="buttons"]') - $parent && $parent - .find('.active') - .removeClass('active') + if ($parent.length) { + var $input = this.$element.find('input') + .prop('checked', !this.$element.hasClass('active')) + .trigger('change') + if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active') + } this.$element.toggleClass('active') } - /* BUTTON PLUGIN DEFINITION - * ======================== */ + // BUTTON PLUGIN DEFINITION + // ======================== var old = $.fn.button $.fn.button = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) + var $this = $(this) + var data = $this.data('bs.button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + if (option == 'toggle') data.toggle() else if (option) data.setState(option) }) } - $.fn.button.defaults = { - loadingText: 'loading...' - } - $.fn.button.Constructor = Button - /* BUTTON NO CONFLICT - * ================== */ + // BUTTON NO CONFLICT + // ================== $.fn.button.noConflict = function () { $.fn.button = old @@ -250,19 +195,22 @@ } - /* BUTTON DATA-API - * =============== */ + // BUTTON DATA-API + // =============== - $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { var $btn = $(e.target) if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') $btn.button('toggle') + e.preventDefault() }) -}(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: carousel.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#carousel + * ======================================================================== * Copyright 2012 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -276,365 +224,211 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * ========================================================== */ + * ======================================================================== */ -!function ($) { ++function ($) { "use strict"; - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ + // CAROUSEL CLASS DEFINITION + // ========================= var Carousel = function (element, options) { - this.$element = $(element) + this.$element = $(element) this.$indicators = this.$element.find('.carousel-indicators') - this.options = options + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + this.options.pause == 'hover' && this.$element .on('mouseenter', $.proxy(this.pause, this)) .on('mouseleave', $.proxy(this.cycle, this)) } - Carousel.prototype = { + Carousel.DEFAULTS = { + interval: 5000 + , pause: 'hover' + , wrap: true + } - cycle: function (e) { - if (!e) this.paused = false - if (this.interval) clearInterval(this.interval); - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getActiveIndex = function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + + return this.$items.index(this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getActiveIndex() + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition.end) { + this.$element.trigger($.support.transition.end) + this.cycle(true) } - , getActiveIndex: function () { - this.$active = this.$element.find('.item.active') - this.$items = this.$active.parent().children() - return this.$items.index(this.$active) + this.interval = clearInterval(this.interval) + + return this + } + + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } + + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } + + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + if (!$next.length) { + if (!this.options.wrap) return + $next = this.$element.find('.item')[fallback]() } - , to: function (pos) { - var activeIndex = this.getActiveIndex() - , that = this + this.sliding = true - if (pos > (this.$items.length - 1) || pos < 0) return + isCycling && this.pause() - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) - if (activeIndex == pos) { - return this.pause().cycle() - } + if ($next.hasClass('active')) return - return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - if (this.$element.find('.next, .prev').length && $.support.transition.end) { - this.$element.trigger($.support.transition.end) - this.cycle(true) - } - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.item.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - e = $.Event('slide', { - relatedTarget: $next[0] - , direction: direction + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') }) + } - if ($next.hasClass('active')) return - - if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { - var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) - $nextIndicator && $nextIndicator.addClass('active') - }) - } - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + $active + .one($.support.transition.end, function () { $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) that.sliding = false setTimeout(function () { that.$element.trigger('slid') }, 0) }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this + .emulateTransitionEnd(600) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') } + isCycling && this.cycle() + + return this } - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ + // CAROUSEL PLUGIN DEFINITION + // ========================== var old = $.fn.carousel $.fn.carousel = function (option) { return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - , action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('carousel', (data = new Carousel(this, options))) + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide + + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) if (typeof option == 'number') data.to(option) else if (action) data[action]() else if (options.interval) data.pause().cycle() }) } - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - $.fn.carousel.Constructor = Carousel - /* CAROUSEL NO CONFLICT - * ==================== */ + // CAROUSEL NO CONFLICT + // ==================== $.fn.carousel.noConflict = function () { $.fn.carousel = old return this } - /* CAROUSEL DATA-API - * ================= */ - $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = $.extend({}, $target.data(), $this.data()) - , slideIndex + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var $this = $(this), href + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false $target.carousel(options) if (slideIndex = $this.attr('data-slide-to')) { - $target.data('carousel').pause().to(slideIndex).cycle() + $target.data('bs.carousel').to(slideIndex) } e.preventDefault() }) -}(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning || this.$element.hasClass('in')) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - $.support.transition && this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning || !this.$element.hasClass('in')) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSE PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.collapse - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + $carousel.carousel($carousel.data()) }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSE NO CONFLICT - * ==================== */ - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - /* COLLAPSE DATA-API - * ================= */ - - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) }) -}(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.1 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ +}(window.jQuery); + +/* ======================================================================== + * Bootstrap: dropdown.js v3.0.0 + * http://twbs.github.com/bootstrap/javascript.html#dropdowns + * ======================================================================== * Copyright 2012 Twitter, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -648,126 +442,116 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * ============================================================ */ + * ======================================================================== */ -!function ($) { ++function ($) { "use strict"; - "use strict"; // jshint ;_; + // DROPDOWN CLASS DEFINITION + // ========================= + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle=dropdown]' + var Dropdown = function (element) { + var $el = $(element).on('click.bs.dropdown', this.toggle) + } - /* DROPDOWN CLASS DEFINITION - * ========================= */ + Dropdown.prototype.toggle = function (e) { + var $this = $(this) - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we we use a backdrop because click events don't delegate + $('
    ","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); -u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("