Pārlūkot izejas kodu

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Angel Fernando Quiroz Campos 6 gadi atpakaļ
vecāks
revīzija
483e0d6fca

+ 7 - 2
app/Migrations/Schema/V111/Version20161028123400.php

@@ -33,12 +33,17 @@ class Version20161028123400 extends AbstractMigrationChamilo
 
         $table = $schema->getTable('personal_agenda');
         if ($table->hasIndex('id')) {
+            $this->addSql('ALTER TABLE personal_agenda DROP INDEX id');
+            $this->addSql('ALTER TABLE personal_agenda DROP INDEX idx_personal_agenda_user');
+            $this->addSql('ALTER TABLE personal_agenda DROP INDEX idx_personal_agenda_parent');
             $this->addSql('ALTER TABLE personal_agenda modify id INT NOT NULL');
-            $table->dropIndex('id');
             if ($table->hasPrimaryKey()) {
-                $table->dropPrimaryKey();
+                $this->addSql('ALTER TABLE personal_agenda drop primary key ');
             }
+
             $this->addSql('ALTER TABLE personal_agenda CHANGE id id INT AUTO_INCREMENT NOT NULL PRIMARY KEY');
+            $this->addSql('CREATE INDEX idx_personal_agenda_user ON personal_agenda (user)');
+            $this->addSql('CREATE INDEX idx_personal_agenda_parent ON personal_agenda (parent_event_id)');
         }
     }
 

+ 6 - 1
custompages/index-unlogged-dist.php

@@ -44,8 +44,13 @@ $rootWeb = api_get_path('WEB_PATH');
 <head>
 	<title>Custompage - login</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+    <link rel="stylesheet" type="text/css" href="<?php echo $rootWeb ?>web/assets/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" type="text/css" href="<?php echo $rootWeb ?>web/assets/flag-icon-css/css/flag-icon.min.css" />
+
     <script type="text/javascript" src="<?php echo $rootWeb; ?>web/assets/jquery/dist/jquery.min.js"></script>
-	<script type="text/javascript">
+    <script type="text/javascript" src="<?php echo $rootWeb; ?>web/assets/bootstrap/dist/js/bootstrap.min.js"></script>
+	<script>
 		$(document).ready(function() {
 			if (top.location != location) {
                 top.location.href = document.location.href;

+ 3 - 0
custompages/lostpassword-dist.php

@@ -16,6 +16,9 @@ $rootWeb = api_get_path('WEB_PATH');
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<script type="text/javascript" src="<?php echo $rootWeb; ?>web/assets/jquery/dist/jquery.min.js"></script>
 
+    <link rel="stylesheet" type="text/css" href="<?php echo $rootWeb ?>web/assets/bootstrap/dist/css/bootstrap.min.css" />
+    <script type="text/javascript" src="<?php echo $rootWeb; ?>web/assets/bootstrap/dist/js/bootstrap.min.js"></script>
+
 	<script type="text/javascript">
 		$(document).ready(function() {
 			// Handler pour la touche retour