diff options
author | Sem <sembrestels@riseup.net> | 2012-07-29 04:19:50 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:19:50 +0200 |
commit | 55bb2b7ed2583683548e314ae13fadde61eb04d6 (patch) | |
tree | 18aa780112c293ef078b7651a0c7f08ffd6b13da /views/default/photos/tagging/help.php | |
parent | 7a9177c9df49d6fc02280df02d6e7f6d52531382 (diff) | |
parent | 12a88208acec40e190b0729887e28c9d9add26c3 (diff) | |
download | elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.gz elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.bz2 |
Merge branch 'no-tagging-photos' of git://github.com/sembrestels/Tidypics
Conflicts:
languages/de.php
languages/en.php
start.php
views/default/forms/photos/admin/settings/main.php
views/default/photos/css.php
Diffstat (limited to 'views/default/photos/tagging/help.php')
-rw-r--r-- | views/default/photos/tagging/help.php | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/views/default/photos/tagging/help.php b/views/default/photos/tagging/help.php deleted file mode 100644 index a7f437e51..000000000 --- a/views/default/photos/tagging/help.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/** - * Instructions on how to peform photo tagging - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$button = elgg_view('output/url', array( - 'text' => elgg_echo('quit'), - 'href' => '#', - 'id' => 'tidypics-tagging-quit', -)); - -$instructions = elgg_echo('tidypics:taginstruct', array($button)); -?> -<div id="tidypics-tagging-help" class="elgg-module elgg-module-popup tidypics-tagging-help pam hidden"> - <?php echo $instructions; ?> -</div> |