From: Sem <sembrestels@riseup.net>
Date: Sun, 29 Jul 2012 02:19:50 +0000 (+0200)
Subject: Merge branch 'no-tagging-photos' of git://github.com/sembrestels/Tidypics
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=55bb2b7ed2583683548e314ae13fadde61eb04d6;p=lorea%2Felgg.git

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
---

55bb2b7ed2583683548e314ae13fadde61eb04d6
diff --cc start.php
index 45e9257f5,8c3dcf7b2..fc3311d42
--- a/start.php
+++ b/start.php
@@@ -38,11 -38,13 +38,8 @@@ function tidypics_init() 
  	$js = elgg_get_simplecache_url('js', 'photos/tidypics');
  	elgg_register_simplecache_view('js/photos/tidypics');
  	elgg_register_js('tidypics', $js, 'footer');
- 	$js = elgg_get_simplecache_url('js', 'photos/tagging');
- 	elgg_register_simplecache_view('js/photos/tagging');
- 	elgg_register_js('tidypics:tagging', $js, 'footer');
 -	$js = elgg_get_simplecache_url('js', 'photos/uploading');
 -	elgg_register_simplecache_view('js/photos/uploading');
 -	elgg_register_js('tidypics:uploading', $js, 'footer');
  
  	elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer');
 -	elgg_register_js('swfobject', 'mod/tidypics/vendors/uploadify/swfobject.js', 'footer');
 -	elgg_register_js('jquery.uploadify-tp', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer');
  	
  	// Add photos link to owner block/hover menus
  	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu');
diff --cc views/default/forms/photos/admin/settings/main.php
index 8791742f1,ab5e7e24a..5bdd8f586
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@@ -5,9 -5,10 +5,9 @@@
  
  $plugin = $vars['plugin'];
  
- $checkboxes = array('tagging', 'view_count', 'exif', 'download_link');
 -$checkboxes = array('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 --cc views/default/photos/css.php
index 3f0218fdc,ee411dcf3..a92c35b3e
--- a/views/default/photos/css.php
+++ b/views/default/photos/css.php
@@@ -70,105 -70,85 +70,6 @@@
  	vertical-align: top;
  }
  
--/* ***************************************
- 	Tagging
 -	AJAX UPLOADER
--*************************************** */
- .tidypics-tagging-border1 {
- 	border: solid 2px white;
 -#tidypics-uploader-steps {
 -	list-style: none;
--}
--
- .tidypics-tagging-border1, .tidypics-tagging-border2,
- .tidypics-tagging-border3, .tidypics-tagging-border4 {
-     filter: alpha(opacity=50);
- 	opacity: 0.5;
 -#tidypics-uploader-steps li a {
 -	font-weight:bold;
--}
--
- .tidypics-tagging-handle {
-     background-color: #fff;
-     border: solid 1px #000;
-     filter: alpha(opacity=50);
-     opacity: 0.5;
 -.tidypics-choose-button-hover {
 -	color:#0054a7;
 -	text-decoration:underline;
--}
--
- .tidypics-tagging-outer {
-     background-color: #000;
-     filter: alpha(opacity=50);
-     opacity: 0.5;
 -.tidypics-disable {
 -	color:#cccccc;
--}
--
- .tidypics-tagging-help {
- 	position: absolute;
- 	left: 50%;
- 	top: -25px;
- 	width: 250px;
- 	margin-left: -125px;
- 	text-align: center;
 -.tidypics-disable:hover {
 -color:#cccccc;
 -text-decoration:none;
--}
--
- .tidypics-tagging-select {
- 	position: absolute;
- 	max-width: 300px;
- }
--
- .tidypics-tag-wrapper {
- 	display: none;
- 	position: absolute;
 -.uploadifyQueueItem {
 -background-color:#F5F5F5;
 -border:2px solid #E5E5E5;
 -font-size:11px;
 -margin-top:5px;
 -padding:10px;
 -width:350px;
--}
--
- .tidypics-tag {
- 	border: 2px solid white;
- 	clear: both;
 -.uploadifyProgress {
 -background-color:#FFFFFF;
 -border-color:#808080 #C5C5C5 #C5C5C5 #808080;
 -border-style:solid;
 -border-width:1px;
 -margin-top:10px;
 -width:100%;
--}
--
- .tidypics-tag-label {
- 	float: left;
- 	margin-top: 5px;
- 	color: #666;
 -.uploadifyProgressBar {
 -background-color: #0054a7;
 -width: 1px;
 -height: 3px;
--}
--
- /* ***************************************
- 	Tagging
- *************************************** */
- #tidypics_uploader {
 -#tidypics-uploader {
--	position:relative;
--	width:400px;
--	min-height:20px;
- }
- 
- #tidypics_choose_button {
- 	position:absolute;
- 	top:0;
- 	left:0;
- 	z-index:0;
- 	display:block;
- 	float:left;
- }
- 
- /* ***************************************
- 	AJAX UPLOADER
- *************************************** */
- #tidypics-uploader-steps {
- 	list-style: none;
--}
--
- #tidypics-uploader-steps li a {
- 	font-weight:bold;
 -#tidypics-choose-button {
 -position:absolute;
 -top:0;
 -left:0;
 -z-index:0;
 -display:block;
 -float:left;
--}
--
- .tidypics-choose-button-hover {
- 	color:#0054a7;
- 	text-decoration:underline;
 -#tidypics-flash-uploader {
 -position:relative;
 -z-index:100;
--}
--
- .tidypics-disable {
- 	color:#cccccc;
 -.uploadifyQueueItem .cancel {
 -	float: right;
--}
--
- .tidypics-disable:hover {
- color:#cccccc;
- text-decoration:none;
 -.uploadifyError {
 -border: 2px solid #FBCBBC;
 -background-color: #FDE5DD;
--}
--
  <?php
  return true;
  ?>