Merge branch 'fixes-#275' into feature/ImprovePledgeEditor

ChurchCRM · Feb 1, 2016 · f911fd4 · f911fd4
2 parents 8b78187 + 0ffed76
commit f911fd4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/churchinfo/Include/Header-function.php b/churchinfo/Include/Header-function.php
@@ -320,7 +320,7 @@ function Header_body_menu() {
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
                     <li class="dropdown settings-dropdown">
-                        <a href="CartView.php">
+                        <a href="<?php echo $sURLPath."/"; ?>CartView.php">
                             <i class="fa fa-shopping-cart"></i>
                             <span class="label label-success"><?= count($_SESSION['aPeopleCart'])?></span>
                         </a>

diff --git a/churchinfo/SundaySchoolClassView.php b/churchinfo/SundaySchoolClassView.php
@@ -64,11 +64,13 @@
 
 ?>
 
-    <link rel="stylesheet" type="text/css" href="<?php echo $sURLPath."/"; ?>css/plugins/select2/select2.css">
-    <link rel="stylesheet" type="text/css" href="<?php echo $sURLPath."/"; ?>css/plugins/select2/select2-bootstrap.css">
-    <link rel="stylesheet" type="text/css" href="//cdn.datatables.net/plug-ins/3cfcc339e89/integration/bootstrap/3/dataTables.bootstrap.css">
-    <script type="text/javascript" language="javascript" src="//cdn.datatables.net/1.10.4/js/jquery.dataTables.min.js"></script>
-    <script type="text/javascript" language="javascript" src="//cdn.datatables.net/plug-ins/3cfcc339e89/integration/bootstrap/3/dataTables.bootstrap.js"></script>
+
+<link rel="stylesheet" type="text/css" href="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.css">
+<script src="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
+<script src="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/dataTables.bootstrap.js"></script>
+
+<link rel="stylesheet" type="text/css" href="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.css">
+<script type="text/javascript" language="javascript" src="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js"></script>
 
     <div class="btn-group pull-right clearfix">
         <a class="btn btn-success" data-toggle="modal" data-target="#compose-modal"><i class="fa fa-pencil"></i> Compose Message</a>
@@ -265,11 +267,6 @@ function implodeUnique($array, $withQuotes) {
     <!-- FLOT CATEGORIES PLUGIN - Used to draw bar charts -->
     <script src="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/flot/jquery.flot.categories.min.js" type="text/javascript"></script>
 
-    <script src="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/plugins/select2/select2.js" type="text/javascript"></script>
-
-    <link rel="stylesheet" type="text/css" href="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/extensions/TableTools/css/dataTables.tableTools.css">
-    <script type="text/javascript" language="javascript" src="<?= $sURLPath; ?>/vendor/almasaeed2010/adminlte/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js"></script>
-
     <script type="text/javascript" charset="utf-8">
         $(document).ready(function() {
             $('#sundayschool').dataTable( {

diff --git a/churchinfo/api/index.php b/churchinfo/api/index.php
@@ -283,7 +283,7 @@
 $app->group('/families', function () use ($app) {
     $app->get('/search/:query', function ($query) use ($app) {
         try {
-            echo $app->FamilyService->search($query);
+            echo $app->FamilyService->getFamiliesJSON($app->FamilyService->search($query));
         } catch (Exception $e) {
             echo exceptionToJSON($e);
         }

diff --git a/churchinfo/mailchimp/index.html b/churchinfo/mailchimp/index.html
diff --git a/churchinfo/vendor/index.html b/churchinfo/vendor/index.html