Robert Marshall преди 8 години
родител
ревизия
397bd12966
променени са 2 файла, в които са добавени 7 реда и са изтрити 12 реда
  1. 3 8
      View/Gallery/view.view
  2. 4 4
      scripts/controllers/gallery.js

+ 3 - 8
View/Gallery/view.view

@@ -17,17 +17,12 @@
 		<?php } ?>
 	</div>
 	<div id="album-images">
-		<div class="image">
-			<p class="title">{{images[imageToShow].imageTitle}}</p>
-			<img ng-src="/{{images[imageToShow].path}}" />
-		</div>
-		<?php /*foreach ($album->Images as $image){ ?>
-			<div class="image">
+		<?php foreach ($album->Images as $index=>$image){ ?>
+			<div class="image" ng-if="<?=$index?>===imageToShow">
 				<p class="title"><?=$image->ImageTitle?></p>
 				<img src="/<?=$image->Path?>" />
-				<p class="description"><?=PostFormatter::FormatToHTML($image->ImageDescription)?></p>
 			</div>
-		<?php }*/ ?>
+		<?php } ?>
 	</div>
 	<scope-init value="images"><?=json_encode($album->Images) ?></scope-init>
 	<div id="nextButton" ng-click="showNextImage()"></div>

+ 4 - 4
scripts/controllers/gallery.js

@@ -1,13 +1,13 @@
 app.controller('gallery', function($scope) {
 	$scope.images=[];
 	$scope.imageToShow=0;
-	
+
 	$scope.showNextImage=function(){
 		$scope.imageToShow=Math.min($scope.imageToShow+1, $scope.images.length-1);
-	}
-	
+	};
+
 	$scope.showPreviousImage=function(){
 		$scope.imageToShow=Math.max($scope.imageToShow-1, 0);
-	}
+	};
 });