merging Paola Shumanova

.gitignore

@@ -1,59 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-=======
-nbproject
-._*
-.~lock.*
->>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951
-.buildpath
-.DS_Store
-<<<<<<< HEAD
-=======
-nbproject
-._*
-.~lock.*
-.buildpath
-.DS_Store
-=======
->>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951
-.idea
-.project
-.settings
-composer.lock
-<<<<<<< HEAD
->>>>>>> refs/heads/master
-=======
->>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951
-=======
 nbproject
 ._*
 .~lock.*
@@ -62,5 +6,4 @@ nbproject
 .idea
 .project
 .settings
-composer.lock
->>>>>>> refs/remotes/zend/master
+composer.lock

config/application.config.php

@@ -2,6 +2,7 @@
 return array(
     'modules' => array(
         'Application',
+
         'Album', //this line is added
         'ZhelyanGuglev',
         'AlexanderAlexandrov',                  // <-- Add this line
@@ -14,10 +15,11 @@
         'AntonTonev',
         'MargaritaKrushkova',
         'StoyanAtanasoff',
-    'IvelinaVelcheva',
-    'MihaelaKerkenekova',
-    'MartinManov',
-  'MarinaGatova',
+		'IvelinaVelcheva',
+		'MihaelaKerkenekova',
+		'MartinManov',
+		'MarinaGatova',
+		'PaolaShumanova',
     ),
     'module_listener_options' => array(
         'config_glob_paths'    => array(

config/autoload/local.php.dist

@@ -12,9 +12,11 @@
  */
 
 return array(
+
     'db' => array(
         'dsn'      => 'mysql:dbname=YOUR_DATABASE_NAME_HERE;host=YOUR_DATABASE_HOST_ADDRESS_HERE',        
         'username' => 'DATABASE USERNAME',
         'password' => 'DATABASE PASSWORD',
     ),
+
 );

module/Application/view/application/index/index.phtml

@@ -23,4 +23,4 @@
        <p><?php echo sprintf($this->translate('If you need any help or support while developing with ZF2, you may reach us via IRC: %s#zftalk.2 on Freenode%s. We\'d love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the %smailing lists%s.'), '<a href="irc://irc.freenode.net/zftalk.2">', '</a>', '<a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">', '</a>') ?></p>
        <p><a class="btn btn-success" href="http://webchat.freenode.net?channels=zftalk.2" target="_blank"><?php echo $this->translate('Ping us on IRC') ?> &raquo;</a></p>
    </div>
-</div>
+</div>

module/PaolaShumanova/Module.php

@@ -0,0 +1,24 @@
+<?php
+namespace PaolaShumanova;
+
+class Module
+{
+    public function getAutoloaderConfig()
+    {
+        return array(
+            'Zend\Loader\ClassMapAutoloader' => array(
+                __DIR__ . '/autoload_classmap.php',
+            ),
+            'Zend\Loader\StandardAutoloader' => array(
+                'namespaces' => array(
+                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
+                ),
+            ),
+        );
+    }
+
+    public function getConfig()
+    {
+        return include __DIR__ . '/config/module.config.php';
+    }
+}

module/PaolaShumanova/autoload_classmap.php

@@ -0,0 +1,2 @@
+<?php
+return array();

module/PaolaShumanova/config/module.config.php

@@ -0,0 +1,33 @@
+<?php
+return array(
+    'controllers' => array(
+        'invokables' => array(
+            'PaolaShumanova\Controller\Index' => 'PaolaShumanova\Controller\IndexController',
+        ),
+    ),
+
+    'router' => array(
+        'routes' => array(
+            'paola-shumanova' => array(
+                'type'    => 'segment',
+                'options' => array(
+                    'route'    => '/paola-shumanova[/:action][/:id]',
+                    'constraints' => array(
+                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                        'id'     => '[0-9]+',
+                    ),
+                    'defaults' => array(
+                        'controller' => 'PaolaShumanova\Controller\Index',
+                        'action'     => 'index',
+                    ),
+                ),
+            ),
+        ),
+    ),
+
+    'view_manager' => array(
+        'template_path_stack' => array(
+            'paola-shumanova' => __DIR__ . '/../view',
+        ),
+    ),
+);

module/PaolaShumanova/src/PaolaShumanova/Controller/IndexController.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/ZendSkeletonApplication for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace PaolaShumanova\Controller;
+
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\ViewModel;
+
+class IndexController extends AbstractActionController
+{
+    public function indexAction()
+    {
+        return new ViewModel();
+    }
+}

module/PaolaShumanova/view/paola-shumanova/index/index.phtml

@@ -0,0 +1 @@
+<h1>I am the index.phtml in PaolaShumanova module</h1>