after merging

Kill0p · Feb 8, 2013 · f2b9b92 · f2b9b92
2 parents e79a499 + e88003b
commit f2b9b92
Show file tree

Hide file tree

Showing 47 changed files with 72 additions and 1,844 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,3 @@
-local.php
-*.local.php
-
 #################
 ## Eclipse
 #################
@@ -173,4 +170,4 @@ nbproject
 .idea
 .project
 .settings
-composer.lock
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,5 @@
+language: php
+php:
+  - "5.5"
+  - "5.4"
+  - "5.3"
diff --git a/README.md b/README.md
@@ -32,4 +32,4 @@ Alternatively, you can install using native git submodules:
 Virtual Host
 ------------
 Afterwards, set up a virtual host to point to the public/ directory of the
-project and you should be ready to go!
+project and you should be ready to go!
diff --git a/config/autoload/.gitignore b/config/autoload/.gitignore
@@ -1,3 +1,3 @@
 #uncomment these for public use:
 local.php
-*.local.php
+*.local.php
diff --git a/config/autoload/global.php b/config/autoload/global.php
@@ -28,5 +28,5 @@
     ),
 
     // ...
-
 );
+
diff --git a/index.php b/index.php
diff --git a/layout.css b/layout.css
@@ -74,4 +74,4 @@ body {
 
 .inside {
  padding: 5px;
-}
+}
diff --git a/module/Album/Module.php b/module/Album/Module.php
@@ -47,3 +47,4 @@ public function getServiceConfig()
         );
     }
 }
+
diff --git a/module/Album/src/Album/Controller/AlbumController.php b/module/Album/src/Album/Controller/AlbumController.php
@@ -39,7 +39,6 @@ public function addAction()
             }
             return array('form' => $form);
         }
-
 
         public function editAction()
         {
@@ -109,6 +108,4 @@ public function getAlbumTable()
           }         
           return $this->albumTable;     
         }
-  }
-
-
+  }
diff --git a/module/Album/src/Album/Model/Album.php b/module/Album/src/Album/Model/Album.php
@@ -91,5 +91,4 @@ public function getInputFilter()
         return $this->inputFilter;
     }
 }
-
-
+
diff --git a/module/Album/view/album/album/add.phtml b/module/Album/view/album/album/add.phtml
@@ -14,4 +14,4 @@ echo $this->formHidden($form->get('id'));
 echo $this->formRow($form->get('title'));
 echo $this->formRow($form->get('artist'));
 echo $this->formSubmit($form->get('submit'));
-echo $this->form()->closeTag();
+echo $this->form()->closeTag();
diff --git a/module/Album/view/album/album/delete.phtml b/module/Album/view/album/album/delete.phtml
@@ -21,4 +21,4 @@ $url = $this->url('album', array(
     <input type="submit" name="del" value="Yes" />
     <input type="submit" name="del" value="No" />
 </div>
-</form>
+</form>
diff --git a/module/Album/view/album/album/edit.phtml b/module/Album/view/album/album/edit.phtml
@@ -21,4 +21,4 @@ echo $this->formHidden($form->get('id'));
 echo $this->formRow($form->get('title'));
 echo $this->formRow($form->get('artist'));
 echo $this->formSubmit($form->get('submit'));
-echo $this->form()->closeTag();
+echo $this->form()->closeTag();
diff --git a/module/Album/view/album/album/index.phtml b/module/Album/view/album/album/index.phtml
@@ -26,4 +26,5 @@ $this->headTitle($title);
             array('action'=>'delete', 'id' => $album->id));?>">Delete</a>
     </td>
 </tr>
-<?php end
+<?php endforeach; ?>
+</table>
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
@@ -15,7 +15,6 @@
                 'options' => array(
                     'route'    => '/',
                     'defaults' => array(
-
                         'controller' => 'Album\Controller\Album',
                         'controller' => 'Application\Controller\Index',
                         'action'     => 'index',

diff --git a/module/Application/language/ar_SY.mo b/module/Application/language/ar_SY.mo
diff --git a/module/Application/language/ar_SY.po b/module/Application/language/ar_SY.po
diff --git a/module/Application/language/cs_CZ.mo b/module/Application/language/cs_CZ.mo
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,4 +74,4 @@ body { @@
     .inside {
      padding: 5px;
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,3 +47,4 @@ public function getServiceConfig()
		);
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -91,5 +91,4 @@ public function getInputFilter()
		return $this->inputFilter;
		}
		}