3 files changed, 1 insertions, 89 deletions
diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php
index c2ae523c1..a35c9ab59 100644
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@ -5,10 +5,9 @@
 
 $plugin = $vars['plugin'];
 
-$checkboxes = array('tagging', 'view_count', 'uploader', 'exif', 'download_link');
+$checkboxes = array('view_count', 'exif', 'download_link');
 foreach ($checkboxes as $checkbox) {
 	echo '<div>';
-	$checked = $plugin->$checkbox ? 'checked' : false;
 	echo elgg_view('input/checkbox', array(
 		'name' => "params[$checkbox]",
 		'value' => true,
diff --git a/views/default/forms/photos/ajax_upload.php b/views/default/forms/photos/ajax_upload.php
deleted file mode 100644
index 3ab578a38..000000000
--- a/views/default/forms/photos/ajax_upload.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Tidypics ajax upload form body
- *
- * @uses $vars['entity']
- */
-
-$album = $vars['entity'];
-
-$ts = time();
-$batch = time();
-$tidypics_token = md5(session_id() . get_site_secret() . $ts . elgg_get_logged_in_user_entity()->salt);
-$basic_uploader_url = current_page_url() . '/basic';
-
-$maxfilesize = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics');
-if (!$maxfilesize) {
-	$maxfilesize = 5;
-}
-
-?>
-
-<p>
-<?php
-	echo elgg_echo('tidypics:uploader:instructs', array($maxfilesize, $basic_uploader_url));
-?>
-</p>
-
-<ul id="tidypics-uploader-steps">
-	<li class="mbm">
-		<div id="tidypics-uploader">
-			<a id="tidypics-choose-button" href="<?php echo $basic_uploader_url; ?>">
-				1. <?php echo elgg_echo('tidypics:uploader:choose'); ?>
-			</a>
-			<div id="tidypics-flash-uploader">
-				<input type="file" id="uploadify" name="uploadify" class="hidden" />
-				<input type="hidden" name="album_guid" value="<?php echo $album->getGUID(); ?>" />
-				<input type="hidden" name="batch" value="<?php echo $batch; ?>" />
-				<input type="hidden" name="tidypics_token" value="<?php echo $tidypics_token; ?>" />
-				<input type="hidden" name="user_guid" value="<?php echo elgg_get_logged_in_user_guid(); ?>" />
-				<input type="hidden" name="Elgg" value="<?php echo session_id(); ?>" />
-			</div>
-		</div>
-	</li>
-	<li class="mbm">
-		<a id="tidypics-upload-button" class="tidypics-disable" href="#">
-			2. <?php echo elgg_echo('tidypics:uploader:upload'); ?>
-		</a>
-	</li>
-	<li class="mbm">
-		<a id="tidypics-describe-button" class="tidypics-disable" href="#">
-			3. <?php echo elgg_echo('tidypics:uploader:describe'); ?>
-		</a>
-	</li>
-</ul>
diff --git a/views/default/forms/photos/image/tag.php b/views/default/forms/photos/image/tag.php
deleted file mode 100644
index 31869be9e..000000000
--- a/views/default/forms/photos/image/tag.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Tag select form body
- *
- * @uses $vars['entity']
- *
- * @author Cash Costello
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
- */
-
-echo '<div class="elgg-col elgg-col-4of5">';
-
-echo elgg_view('input/autocomplete', array(
-	'name' => 'username',
-	'match_on' => 'friends',
-));
-
-echo elgg_view('input/hidden', array(
-	'name' => 'guid',
-	'value' => $vars['entity']->getGUID(),
-));
-
-echo elgg_view('input/hidden', array(
-	'name' => 'coordinates',
-));
-
-echo '</div>';
-
-echo '<div class="elgg-col elgg-col-1of5 center">';
-echo elgg_view('input/submit', array(
-	'value' => elgg_echo('tidypics:actiontag'),
-));
-echo '</div>';