diff options
| -rw-r--r-- | languages/ca.php | 11 | ||||
| -rw-r--r-- | languages/en.php | 11 | ||||
| -rw-r--r-- | languages/es.php | 11 | ||||
| -rw-r--r-- | start.php | 6 | ||||
| -rw-r--r-- | views/default/css/lightbox.php | 14 | ||||
| -rw-r--r-- | views/default/js/embed/embed.php | 16 | ||||
| -rw-r--r-- | views/default/js/lightbox.php | 15 |
7 files changed, 22 insertions, 62 deletions
diff --git a/languages/ca.php b/languages/ca.php index 10355fab1..214d327aa 100644 --- a/languages/ca.php +++ b/languages/ca.php @@ -7,23 +7,12 @@ *
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
-<<<<<<< HEAD * This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
-======= - * This file is part of the Colorbox plugin for Elgg.
- *
- * Colorbox is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * Colorbox is distributed in the hope that it will be useful, but
->>>>>>> cb063a6... Finalize Copyright information * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Affero General Public License for more details.
diff --git a/languages/en.php b/languages/en.php index 8b18532a6..70bab4e05 100644 --- a/languages/en.php +++ b/languages/en.php @@ -7,23 +7,12 @@ *
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
-<<<<<<< HEAD * This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
-======= - * This file is part of the Colorbox plugin for Elgg.
- *
- * Colorbox is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * Colorbox is distributed in the hope that it will be useful, but
->>>>>>> cb063a6... Finalize Copyright information * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Affero General Public License for more details.
diff --git a/languages/es.php b/languages/es.php index 6855c93f2..e49d0db47 100644 --- a/languages/es.php +++ b/languages/es.php @@ -7,23 +7,12 @@ *
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
-<<<<<<< HEAD * This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
-======= - * This file is part of the Colorbox plugin for Elgg.
- *
- * Colorbox is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * Colorbox is distributed in the hope that it will be useful, but
->>>>>>> cb063a6... Finalize Copyright information * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Affero General Public License for more details.
@@ -1,6 +1,6 @@ <?php /** - * Colorbox -- Add jQuery.lightbox support to Elgg + * Colorbox -- A lightweight, customizable lightbox plugin for jQuery * * @package Lorea * @subpackage Colorbox @@ -23,10 +23,6 @@ * You should have received a copy of the GNU Affero General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/>. - * - * The Colorbox plugin for Elgg contains the Colorbox jQuery plugin, - * released under the MIT License, and Copyright 2011 Jack Moore. - * See vendors/colorbox/ */ elgg_register_event_handler('init', 'system', 'colorbox_init'); diff --git a/views/default/css/lightbox.php b/views/default/css/lightbox.php index d590c506a..e18c02bf8 100644 --- a/views/default/css/lightbox.php +++ b/views/default/css/lightbox.php @@ -2,19 +2,19 @@ /** * Colorbox -- Stylesheet * + * Used as a view because we need to pass a full URL to AlphaImageLoader. + * * @package Lorea * @subpackage Colorbox * * Copyright 2011-2012 Lorea Faeries <federation@lorea.org> * - * This file is part of the Colorbox plugin for Elgg. - * - * Colorbox is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. * - * Colorbox is distributed in the hope that it will be useful, but + * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. diff --git a/views/default/js/embed/embed.php b/views/default/js/embed/embed.php index 7856b4b58..42165fa42 100644 --- a/views/default/js/embed/embed.php +++ b/views/default/js/embed/embed.php @@ -1,6 +1,6 @@ <?php /** - * Colorbox -- Elgg Embed Javascript + * Colorbox -- Javascript * * Used as a view because we need to pass a full URL to AlphaImageLoader. * @@ -9,14 +9,12 @@ * * Copyright 2011-2012 Lorea Faeries <federation@lorea.org> * - * This file is part of the Colorbox plugin for Elgg. + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. * - * Colorbox is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * Colorbox is distributed in the hope that it will be useful, but + * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. @@ -35,7 +33,7 @@ elgg.embed.init = function() { // caches the current textarea id $(".embed-control").live('click', function() { - var textAreaId = /embed-control-(\S)+/.exec($(this).attr('class'))[0]; + var textAreaId = /embed-control-(\S)+/.exec($(this).attr('class'))[0]; elgg.embed.textAreaId = textAreaId.substr("embed-control-".length); }); diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php index 3e0f8912b..732092e2b 100644 --- a/views/default/js/lightbox.php +++ b/views/default/js/lightbox.php @@ -1,6 +1,6 @@ <?php /** - * Colorbox -- Javascript + * Colorbox -- Stylesheet * * Used as a view because we need to pass a full URL to AlphaImageLoader. * @@ -9,14 +9,12 @@ * * Copyright 2011-2012 Lorea Faeries <federation@lorea.org> * - * This file is part of the Colorbox plugin for Elgg. + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. * - * Colorbox is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * Colorbox is distributed in the hope that it will be useful, but + * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. @@ -38,6 +36,7 @@ * * @todo add support for passing options: $('#myplugin-lightbox').elgg.ui.lightbox(options); */ + ?> /** |