[5118] makaanga/0.x/htdocs: Makaanga. Merge r5116 in preparation for 0.7.1.

1 view
Skip to first unread message

s...@habariproject.org

unread,
May 8, 2011, 8:46:50 AM5/8/11
to habar...@googlegroups.com

Diff

Property changes: makaanga/0.x/htdocs


Modified: svn:mergeinfo

/tags/0.7/htdocs:5056-5058 /trunk/htdocs:4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs:2984-3026 /tags/0.7/htdocs:5056-5058 /trunk/htdocs:4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116

Property changes: makaanga/0.x/htdocs/LICENCE


Modified: svn:mergeinfo

/tags/0.7/htdocs/LICENCE:5056-5058 /trunk/htdocs/LICENCE:2-2548,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs/LICENCE:2984-3026 /tags/0.7/htdocs/LICENCE:5056-5058 /trunk/htdocs/LICENCE:2-2548,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116

Property changes: makaanga/0.x/htdocs/NOTICE


Modified: svn:mergeinfo

/tags/0.7/htdocs/NOTICE:5056-5058 /trunk/htdocs/NOTICE:2-609,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs/NOTICE:2984-3026 /tags/0.7/htdocs/NOTICE:5056-5058 /trunk/htdocs/NOTICE:2-609,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116

Property changes: makaanga/0.x/htdocs/index.php


Modified: svn:mergeinfo

/tags/0.7/htdocs/index.php:5056-5058 /trunk/htdocs/index.php:2-284,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs/index.php:2984-3026 /tags/0.7/htdocs/index.php:5056-5058 /trunk/htdocs/index.php:2-284,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116

Property changes: makaanga/0.x/htdocs/system


Modified: svn:mergeinfo

/tags/0.7/htdocs/system:5056-5058 /trunk/htdocs/system:2-7,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs/system:2984-3026 /tags/0.7/htdocs/system:5056-5058 /trunk/htdocs/system:2-7,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116

Modified: makaanga/0.x/htdocs/system/admin/js/media.js (5117 => 5118)


--- makaanga/0.x/htdocs/system/admin/js/media.js	2011-05-08 11:19:51 UTC (rev 5117)
+++ makaanga/0.x/htdocs/system/admin/js/media.js	2011-05-08 12:46:44 UTC (rev 5118)
@@ -113,10 +113,8 @@
 	},
 	
 	resize_media_row: function() {
-		// Obtain the silo id we're working in so we can resize the correct silo's media_row
-		var silo_id = $('.mediasplitter:not(".ui-tabs-hide")').attr('id');
 		var dirswidth = 0;
-		$('#' + silo_id +' .media_dirlevel').each(function(){
+		$('.mediasplitter:visible .media_dirlevel').each(function(){
 			var maxw = 0;
 			$(this).find('.directory').each(function(){
 				maxw = Math.max(maxw, $(this).outerWidth());
@@ -124,7 +122,7 @@
 			$(this).width(maxw);
 			dirswidth += maxw;
 		});
-		$('#' + silo_id +' .media_row').width(dirswidth + $('#' + silo_id +' .mediaphotos').outerWidth() + 33);
+		$('.mediasplitter:visible .media_row').width(dirswidth + $('.mediasplitter:visible .mediaphotos').outerWidth() + 33);
 	},
 
 	clickdir: function(el, path) {

Property changes: makaanga/0.x/htdocs/system/plugins/coreblocks


Modified: svn:mergeinfo

/tags/0.7/htdocs/system/plugins/coreblocks:5056-5058 /trunk/htdocs/system/coreblocks:2-7 /trunk/htdocs/system/plugins/coreblocks:4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs/system/coreblocks:2984-3026 /tags/0.7/htdocs/system/plugins/coreblocks:5056-5058 /trunk/htdocs/system/coreblocks:2-7 /trunk/htdocs/system/plugins/coreblocks:4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116

Property changes: makaanga/0.x/htdocs/system/vendor


Modified: svn:mergeinfo

/tags/0.7/htdocs/system/vendor:5056-5058 /trunk/htdocs/scripts:2-7 /trunk/htdocs/system/vendor:4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs/scripts:2984-3026 /tags/0.7/htdocs/system/vendor:5056-5058 /trunk/htdocs/scripts:2-7 /trunk/htdocs/system/vendor:4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116

Property changes: makaanga/0.x/htdocs/system/vendor/jquery.js


Modified: svn:mergeinfo

/tags/0.7/htdocs/system/vendor/jquery.js:5056-5058 /trunk/htdocs/scripts/jquery-1.3.2.min.js:2-7 /trunk/htdocs/system/vendor/jquery.js:4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs/scripts/jquery-1.3.2.min.js:2984-3026 /tags/0.7/htdocs/system/vendor/jquery.js:5056-5058 /trunk/htdocs/scripts/jquery-1.3.2.min.js:2-7 /trunk/htdocs/system/vendor/jquery.js:4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116

Property changes: makaanga/0.x/htdocs/user


Modified: svn:mergeinfo

/tags/0.7/htdocs/user:5056-5058 /trunk/htdocs/user:2-21,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113 + /branches/HAT-1.0/htdocs/user:2984-3026 /tags/0.7/htdocs/user:5056-5058 /trunk/htdocs/user:2-21,4874-4876,4880-4888,4890-4905,4908-4917,4919-4921,4923-4924,4927-4933,4935-4936,4938,4946,4949,4954,4957,4960-4965,4967-4979,4981-4982,4988-4991,4993-5004,5006-5012,5014-5020,5022,5025-5028,5030,5032-5034,5038-5044,5057-5059,5083,5089,5092,5113,5116
Reply all
Reply to author
Forward
0 new messages