diff --git a/.c9revisions/README.md.c9save b/.c9revisions/README.md.c9save new file mode 100644 index 00000000..d511303e --- /dev/null +++ b/.c9revisions/README.md.c9save @@ -0,0 +1 @@ +{"ts":1360917272605,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"This is a sample PHP project\n\nZendSkeletonApplication\n=======================\n\nIntroduction\n------------\nThis is a simple, skeleton application using the ZF2 MVC layer and module\nsystems. This application is meant to be used as a starting place for those\nlooking to get their feet wet with ZF2.\n\n\nInstallation\n------------\n\nUsing Composer (recommended)\n----------------------------\nThe recommended way to get a working copy of this project is to clone the repository\nand use composer to install dependencies:\n\n cd my/project/dir\n git clone git://github.com/zendframework/ZendSkeletonApplication.git\n cd ZendSkeletonApplication\n php composer.phar install\n\nUsing Git submodules\n--------------------\nAlternatively, you can install using native git submodules:\n\n git clone git://github.com/zendframework/ZendSkeletonApplication.git --recursive\n\nVirtual Host\n------------\nAfterwards, set up a virtual host to point to the public/ directory of the\nproject and you should be ready to go!\n\n"]],"start1":0,"start2":0,"length1":0,"length2":997}]],"length":997} diff --git a/.c9revisions/StoyanAtanasoff.php.c9save b/.c9revisions/StoyanAtanasoff.php.c9save new file mode 100644 index 00000000..8abc0567 --- /dev/null +++ b/.c9revisions/StoyanAtanasoff.php.c9save @@ -0,0 +1,12 @@ +{"ts":1359709576891,"silentsave":true,"restoring":false,"patch":[[]],"length":0} +{"contributors":[],"silentsave":true,"ts":1359709580066,"patch":[[{"diffs":[[1,""]],"start1":27,"start2":27,"length1":8,"length2":12}]],"length":39,"saved":false} +{"ts":1359709603971,"patch":[[{"diffs":[[0,"oyan Ata"],[1,"ec"],[0,"nasoff !"]],"start1":18,"start2":18,"length1":16,"length2":18},{"diffs":[[0,"soff !\";"],[1,"h"],[0,"\n?>"]],"start1":30,"start2":30,"length1":11,"length2":12}]],"length":42,"saved":false} +{"ts":1359709605234,"patch":[[{"diffs":[[0,"soff !\";"],[-1,"h"],[0,"\n?>"]],"start1":30,"start2":30,"length1":12,"length2":11}]],"length":41,"saved":false} +{"ts":1359709611632,"patch":[[{"diffs":[[0,"oyan Ata"],[-1,"e"],[0,"cnasoff "]],"start1":18,"start2":18,"length1":17,"length2":16}]],"length":40,"saved":false} +{"ts":1359709615577,"patch":[[{"diffs":[[0," Ata"],[-1,"c"],[0,"n"],[1,"as"],[0,"asof"]],"start1":22,"start2":22,"length1":10,"length2":11}]],"length":41,"saved":false} diff --git a/.c9revisions/StoyanCheresharov/css/exp.css.c9save b/.c9revisions/StoyanCheresharov/css/exp.css.c9save new file mode 100644 index 00000000..1c0f312c --- /dev/null +++ b/.c9revisions/StoyanCheresharov/css/exp.css.c9save @@ -0,0 +1,2 @@ +{"ts":1361703623298,"silentsave":true,"restoring":false,"patch":[[]],"length":0} +{"contributors":[],"silentsave":false,"ts":1361703643427,"patch":[[{"diffs":[[1,"h1 {\n color: red; \n}"]],"start1":0,"start2":0,"length1":0,"length2":26}]],"length":26,"saved":false} diff --git a/.c9revisions/StoyanCheresharov/css/exp_bg.css.c9save b/.c9revisions/StoyanCheresharov/css/exp_bg.css.c9save new file mode 100644 index 00000000..7493f4f6 --- /dev/null +++ b/.c9revisions/StoyanCheresharov/css/exp_bg.css.c9save @@ -0,0 +1 @@ +{"ts":1361520632903,"silentsave":true,"restoring":false,"patch":[[]],"length":0} diff --git a/.c9revisions/StoyanCheresharov/exp_bg.html.c9save b/.c9revisions/StoyanCheresharov/exp_bg.html.c9save new file mode 100644 index 00000000..90f4760e --- /dev/null +++ b/.c9revisions/StoyanCheresharov/exp_bg.html.c9save @@ -0,0 +1,4 @@ +{"ts":1361520348700,"silentsave":true,"restoring":false,"patch":[[]],"length":0} +{"contributors":[],"silentsave":false,"ts":1361520420246,"patch":[[{"diffs":[[1,"\n\n \n Exp BG\n \n \n

Exp BG

\n \n"]],"start1":0,"start2":0,"length1":0,"length2":130}]],"length":130,"saved":false} +{"ts":1361520615381,"patch":[[{"diffs":[[0,"/title>\n"],[1," \n"],[0," \n"],[1," \n"],[0," This is a title

"],[0,"This tex"]],"start1":0,"start2":0,"length1":8,"length2":35},{"diffs":[[0,"e server"],[1,"

"]],"start1":50,"start2":50,"length1":8,"length2":12}]],"length":62,"saved":false} diff --git a/.c9revisions/StoyanCheresharov/index.html.c9save b/.c9revisions/StoyanCheresharov/index.html.c9save new file mode 100644 index 00000000..0763d7fa --- /dev/null +++ b/.c9revisions/StoyanCheresharov/index.html.c9save @@ -0,0 +1,6 @@ +{"ts":1360862909416,"silentsave":true,"restoring":false,"patch":[[]],"length":0} +{"contributors":[],"silentsave":false,"ts":1360863042611,"patch":[[{"diffs":[[1,"\n\n \n JS experiments\n + + +

Exp BG

+
Test
+ + \ No newline at end of file diff --git a/StoyanCheresharov/exp_bg.txt b/StoyanCheresharov/exp_bg.txt new file mode 100644 index 00000000..56d32f5b --- /dev/null +++ b/StoyanCheresharov/exp_bg.txt @@ -0,0 +1 @@ +

This is a title

This text comes from the server

\ No newline at end of file diff --git a/StoyanCheresharov/index.html b/StoyanCheresharov/index.html new file mode 100644 index 00000000..760428c1 --- /dev/null +++ b/StoyanCheresharov/index.html @@ -0,0 +1,17 @@ + + + + JS experiments + + + + +

Exp

+

Test

+
+
Subtitle
+

This is my test

+
+

This is my test

+ + \ No newline at end of file diff --git a/StoyanCheresharov/js/exp.js b/StoyanCheresharov/js/exp.js new file mode 100644 index 00000000..f635e50f --- /dev/null +++ b/StoyanCheresharov/js/exp.js @@ -0,0 +1,301 @@ +/* +(function(){ + window.onload = function(e){ + var elements, i=0; + elements = document.getElementsByTagName('h1'); + for (i=0; i < elements.length; i++) { + alert(elements[i]); + elements[i].style.color = 'red'; + } + }; +})(); +*/ + +/* +alert(typeof myExample); +alert(myExample instanceof Object); +myExample.prop1 = 'Roperty 1'; +console.log(myExample.prop1); +var myGlobalFunction = function(param1){ + return param1; +}; + +console.log(myGlobalFunction('Stoyan')); + +function myNextFunction(param1) { + return param1; +} + +alert(myNextFunction(myGlobalFunction)); +*/ +(function(){ +/* + function myExample(parm1) { + var name = 'Stoyan'; + // this.prop1= 'Stoyan'; + alert(name); + alert(this.prop1); + } +*/ +/* + // alert(myExample); + // alert(myExample()); + // alert(new myExample()); + + + function foo() { + // function body goes here + } + + var f = function(x) { return x*x; }; // function literal + + // var myFunction = new Function('arg1', 'arg2', 'return arg1;'); + + alert(myExample.length); + + myExample(); + + myExample.call({prop1: 'Nikola'},1); +*/ +/* + var myObject = {}; + myObject.prop1 = 'Stoyan'; + myObject['prop2'] = 'Cheresharov'; + myObject.method1 = function(arg1, arg2){ alert('Arguments');}; + + + // var myObject = new Object('arg1', 'arg2'); + + alert(myObject.arg1); + // constructor for a class of objects + function MyClass(){ + this.prop1 = 'Stoyan'; + this.method1 = function(arg1, arg2){ alert('Arguments');}; + } +*/ +/* + var obj1 = {}; + obj1.prop1 = 'Stoyan'; + obj1.method1 = function(arg1, arg2){ alert('Arguments');}; + + var obj2 = {}; + obj2.prop1 = 'Stoyan'; + obj2.method1 = function(arg1, arg2){ alert('Arguments');}; +*/ +/* + var obj1 = new MyClass(); + var obj2 = new MyClass(); + + alert(obj1.prop1); + alert(obj2.prop1); + + alert(obj1 instanceof MyClass); +*/ +/* + function MyNewClass(arg1, arg2){ + this.name = 'Stoyan'; + this.family = 'Cheresharov'; + this.method1 = function(){ alert('Do something'); }; // each instance will have a separate copy if this function + } + + MyNewClass.prototype = { + name: 'Nikola', + family: 'Cheresharov' + }; + + MyNewClass.prototype.constructor = MyNewClass; + + // Douglas Crockford prototypel styple + window.object = function(o){ + var F = function(){}; + F.prototype = o; + return new F(); + }; + + var myObject = function(){ + var counter = 1; + return {'counter': counter}; // there is a closure + }(); // !!! execute right at the spot to get the object + +// alert(myExample); +// alert(foo); +*/ +})(); + +(function(){ + + window.onload = function(e){ + + // I Objects +/* + // 1) created as Literal (Expression) + var myObject = {}; + myObject.prop1 = 'Stoyan'; + myObject['prop2'] = 'Cheresharov'; + myObject.method1 = function(arg1, arg2){ alert('Arguments');}; + + }; +*/ +/* + // 2) Created with On eof the Standart Classes Object Class + var myObject = new Object('arg1', 'arg2'); +*/ +/* + // 3) created with a Constructor taht defines a Class of Objects custom class + function MyClass(){ + this.prop1 = 'Stoyan'; + this.method1 = function(arg1, arg2){ alert('Arguments');}; + } + + MyClass.prototype = { + 'prop1': 'Nikola', + 'prop2': 'Cheresharov' // they are in the shadow of prop1 and prop2 of the object + }; + + MyClass.prototype.constructor = MyClass; + + // alert(MyClass.prototype.constructor); + + var myObject = new MyClass(); + // alert(myObject.constructor); + + // Universal Properties and methods + // 1) property + alert('myObject.constructor: ' + myObject.constructor); // property + + // 2) Methods + alert( 'myObject.toString(): ' + myObject.toString() ); // method + + alert( 'myObject.toLocaleString(): ' + myObject.toLocaleString() ); // method + alert( 'myObject.valueOf(): ' + myObject.valueOf() ); // method + alert( 'myObject.hasOwnProperty(prop1): ' + myObject.hasOwnProperty('prop1') ); // method + alert( 'myObject.propertyIsEnumerable(prop1): ' + myObject.propertyIsEnumerable('prop1') ); // method + alert( 'Object.isPrototypeOf( myObject ): ' + Object.isPrototypeOf( myObject ) ); // method +*/ + + // II Functions +/* + // 1) Create statement + function myFunction(arg1, arg2){ + alert('I am here'); + } +*/ +/* + // 2) literal (expression) + var myFunction = function forCallBack(arg1, arg2){ + for (var i = 0 ; 0 < arguments.length; i++) + { + alert(arguments[i]); + } + // arguments.callee(); // recursion self reference + }; +*/ +/* + // 3) with the Function class + var myFunction = new Function('arg1', 'arg2', 'return arg1;'); +*/ + + // III + + // 1) DOM Manipulation +/* + var nodeList = document.getElementsByTagName('div'); + + for (var i=0; i < nodeList.length; i++) + { + alert(nodeList[i]); + } + + var element = document.getElementById('myPi'); + alert(element); + + alert( nodeList[0].parentNode ); + alert( nodeList[0].childNodes[0] ); + alert( nodeList[0].firstChild ); + alert( nodeList[0].lastChild ); + alert( nodeList[0].nextSibling ); + alert( nodeList[0].previousSibling ); + alert( nodeList[0].style.background = 'gray' ); + alert( nodeList[0].innerHTML = 'I am dinamic head' ); + alert( nodeList[0].nodeType ); + alert( nodeList[0].nodeValue ); + alert( nodeList[0].nodeName ); + alert( nodeList[0].getAttribute('class') ); + alert( nodeList[0].setAttribute('class', 'content') ); + + var element = document.createElement('div'); + element.setAttribute('class', 'head'); + element.innerHTML = 'I have been added by JS'; + nodeList[0].appendChild(element); + // nodeList[0].insertBefore(element); +*/ + + // 2) Remouting ther e are 8 variants GET, POST / synchronous, asynchronous / text XML + var xmlhttp; + if (window.XMLHttpRequest) + {// code for IE7+, Firefox, Chrome, Opera, Safari + xmlhttp=new window.XMLHttpRequest(); + } + else if (window.ActiveXObject) + {// code for IE6, IE5 + // xmlhttp = new window.ActiveXObject('Msxml2.XMLHTTP'); + xmlhttp=new window.ActiveXObject("Microsoft.XMLHTTP"); + } + else + { + alert('Your browser doesn\'t support XHR'); + } + + // 2.1) + xmlhttp.open('GET', 'exp.txt', true); + xmlhttp.send(); + // notice instead of direct alert with the xmlhttp.responsetext / XML + xmlhttp.onreadystatechange = function(){ + if (xmlhttp.readyState == 4 && xmlhttp.status == 200) // 404 not founs + { + var responseText = xmlhttp.responseText; + var responseXML = xmlhttp.responseXML; // documentElement is the root element of the document + // var object = eval(responseText); + alert(responseText); + } + }; + + + // 3) Dynamic Behaviour + // 3.1 Get the element + var nodeList = document.getElementsByTagName('div'); + + var element = nodeList[0]; + + + // 3.2 if it is going to be a function literal should be here + var onMouseOver = function(e){ // function literal + // function onMouseOver(e){ // function statement + var event = e || window.event; + var element = event.target || event.srcElement; // currentTarget + alert('The mouse was over me: ' + element.innerHTML); + }; + + + // 3.3 check which DOM 0, 1, 2 is suported + if (element.addEventListener) + { // all aothers + element.addEventListener('mouseover', onMouseOver, false); // capture or not + } + else if (element.attachEvent) + { // MS + element.attachEvent('onmouseover', onMouseOver); + } + else + { // DOM 0 + element.onmouseover = onMouseOver; + } + + var functionToExecute = function() { + alert('10000 miliseconds'); + }; + + var deferer = window.setInterval(functionToExecute, 10000); + } +})(); + diff --git a/StoyanCheresharov/js/exp_bg.js b/StoyanCheresharov/js/exp_bg.js new file mode 100644 index 00000000..043eca77 --- /dev/null +++ b/StoyanCheresharov/js/exp_bg.js @@ -0,0 +1,171 @@ +// alert('hello World'); +// I Objects +// 1) created as Literal (Expression) +/* +var myObject = {}; + +myObject.prop1 = 'Stoyan'; + +myObject['prop2'] = 'Cheresharov'; + +myObject.method1 = function(arg1, arg2){ alert('Arguments ' + this.prop1 + this.prop2);}; + +alert('Hello World ' + myObject.prop1 + myObject['prop2']); + +myObject.method1(); +*/ + +// 2) Created with On eof the Standart Classes Object Class +/* +var myObject = new Object('arg1', 'arg2'); + +myObject.arg1 = 'Stoyan'; + +alert(myObject.arg1); + +*/ + +// 3) created with a Constructor that defines a Class of Objects. custom class +/* +function MyClass(){ + this.prop1 = 'Stoyan'; + this.method1 = function(arg1, arg2){ alert('Arguments');}; +} + +MyClass.prototype = { + 'prop1': 'Nikola', + 'prop2': 'Cheresharov' +}; + +MyClass.prototype.constructor = MyClass; + +var myObject = new MyClass(); + +alert('Hello ' + myObject.prop1); + +var myObject2 = new MyClass(); +alert('Hello ' + myObject2.prop1); +alert('Hello ' + myObject2.prop2); +alert(MyClass.prototype.constructor); +*/ + + +// II Functions +/* +// 1) Create statement +function myFunction(arg1, arg2){ + alert('I m here'); +} +*/ +// myFunction(); +/* +// 2) literal (expression) +var myFunction = function forCallBack(arg1, arg2){ + for (var i = 0 ; 0 < arguments.length; i++) + { + alert(arguments[i]); + } +// argument.callee(); // recursion self reference +}; +*/ +// myFunction('Stoyan'); + +// 3) with the Function class +/* +var myFunction = new Function('arg1', 'arg2', 'return arg1;'); + +alert(myFunction('Stoyan', 'Cheresharov')); +*/ + +// III +// 1) DOM Manipulation +/* +var nodeList = document.getElementsByTagName('div'); +for (var i=0; i < nodeList.length; i++) +{ + alert(nodeList[i]); +} +*/ +window.onload = function(e){ +/* + var element = document.getElementById('myDiv'); + alert(element); +*/ +/* + var nodeList = document.getElementsByTagName('div'); + for (var i=0; i < nodeList.length; i++) + { + alert(nodeList[i]); + nodeList[i].style.color = 'green'; + } + + alert( nodeList[0].parentNode ); + + nodeList[0].innerHTML = 'Hello World from JS'; +*/ + // 2) Remouting ther e are 8 variants GET, POST / synchronous, asynchronous / text XML + var xmlhttp = null; + if (window.XMLHttpRequest) + {// code for IE7+, Firefox, Chrome, Opera, Safari + xmlhttp=new window.XMLHttpRequest(); + } + else if (window.ActiveXObject) + {// code for IE6, IE5 + // xmlhttp = new window.ActiveXObject('Msxml2.XMLHTTP'); + xmlhttp=new window.ActiveXObject("Microsoft.XMLHTTP"); + } + else + { + alert('Your browser doesn\'t support XHR'); + } + + // 2) asynchronous + // 2.1) + xmlhttp.open('GET', 'exp_bg.txt', true); + xmlhttp.send(); + // notice instead of direct alert with the xmlhttp.responsetext / XML + xmlhttp.onreadystatechange = function(){ + if (xmlhttp.readyState == 4 && xmlhttp.status == 200) // 404 not founs + { + var responseText = xmlhttp.responseText; + + var element = document.getElementById('myDiv'); + element.innerHTML = responseText; + + var responseXML = xmlhttp.responseXML; // documentElement is the root element of the document + // var object = eval(responseText); + // alert(responseText); + } + }; + + // 3) Dynamic Behaviour + // 3.1 Get the element + var nodeList = document.getElementsByTagName('div'); + + var element = nodeList[0]; + + // 3.2 if it is going to be a function literal should be here + var onMouseOver = function(e){ // function literal + // function onMouseOver(e){ // function statement + var event = e || window.event; + var element = event.target || event.srcElement; // currentTarget + alert('The mouse was over me: ' + element.innerHTML); + }; + + // 3.3 check which DOM 0, 1, 2 is suported + if (element.addEventListener) + { // all aothers + element.addEventListener('mouseover', onMouseOver, false); // capture or not + } + else if (element.attachEvent) + { // MS + element.attachEvent('onmouseover', onMouseOver); + } + else + { // DOM 0 + element.onmouseover = onMouseOver; + } + + +}; + diff --git a/StudentContributor.php b/StudentContributor.php deleted file mode 100644 index e3de1596..00000000 --- a/StudentContributor.php +++ /dev/null @@ -1,8 +0,0 @@ - - - PHP Test - - - Hello World from Stoyan Cheresharov. change. Other change

'; ?> - - \ No newline at end of file diff --git a/StudentContributorBg.php b/StudentContributorBg.php new file mode 100644 index 00000000..3a9bbdd5 --- /dev/null +++ b/StudentContributorBg.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World Student Contributor Bg

'; ?> + + \ No newline at end of file diff --git a/VasilKapitanski.php b/VasilKapitanski.php new file mode 100644 index 00000000..df45846f --- /dev/null +++ b/VasilKapitanski.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World I am Vasil Kapitanski. It`s nice to meet you!

'; ?> + + \ No newline at end of file diff --git a/config/application.config.php b/config/application.config.php index 92359c6d..14180c72 100644 --- a/config/application.config.php +++ b/config/application.config.php @@ -2,7 +2,17 @@ return array( 'modules' => array( 'Application', +<<<<<<< HEAD 'Album', //this line is added +======= + 'Album', // <-- Add this line + 'ZhelyanGuglev', + 'AlexanderAlexandrov', // <-- Add this line + 'GyunerZeki', + 'StoyanCheresharov', // <-- Add this line + 'FmiStudent', // <-- Add this line + 'StudentBg', +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 ), 'module_listener_options' => array( 'config_glob_paths' => array( diff --git a/config/autoload/.gitignore b/config/autoload/.gitignore new file mode 100644 index 00000000..1a83fda6 --- /dev/null +++ b/config/autoload/.gitignore @@ -0,0 +1,2 @@ +local.php +*.local.php diff --git a/config/autoload/README.md b/config/autoload/README.md index 4e504db0..7f8b5216 100644 --- a/config/autoload/README.md +++ b/config/autoload/README.md @@ -1,3 +1,11 @@ +<<<<<<< HEAD +======= +Important +========= +Create file local.php for your local repository. +Use the sample local.php.dist ! + +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 About this directory: ===================== diff --git a/config/autoload/global.php b/config/autoload/global.php index abdfbbcc..9c8069a7 100644 --- a/config/autoload/global.php +++ b/config/autoload/global.php @@ -1,5 +1,6 @@ 'mysql:dbname=viktorfmi;host=viktorfmi-db.my.phpcloud.com', 'username' => 'viktorfmi', 'password' => '166victor196', +======= +* Global Configuration Override +* +* You can use this file for overridding configuration values from modules, etc. +* You would place values in here that are agnostic to the environment and not +* sensitive to security. +* +* @NOTE: In practice, this file will typically be INCLUDED in your source +* control, so do not include passwords or other sensitive information in this +* file. +*/ + +/* +return array( +// ... +); +*/ + +return array( + 'db' => array( + 'driver' => 'Pdo', +// 'dsn' => 'mysql:dbname=wingman;host=wingman-db.my.phpcloud.com', +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 'driver_options' => array( PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'UTF8\'' ), @@ -27,4 +51,8 @@ => 'Zend\Db\Adapter\AdapterServiceFactory', ), ), +<<<<<<< HEAD +); +======= ); +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist new file mode 100644 index 00000000..ab542a59 --- /dev/null +++ b/config/autoload/local.php.dist @@ -0,0 +1,20 @@ + array( + 'dsn' => 'mysql:dbname=YOUR_DATABASE_NAME_HERE;host=YOUR_DATABASE_HOST_ADDRESS_HERE', + 'username' => 'DATABASE USERNAME', + 'password' => 'DATABASE PASSWORD', + ), +); diff --git a/index.html b/index.html index 581e9b10..44707d2f 100644 --- a/index.html +++ b/index.html @@ -22,30 +22,30 @@

Content

Navigation

diff --git a/index.php b/index.php index 5004c279..5d4c5955 100644 --- a/index.php +++ b/index.php @@ -3,6 +3,7 @@ Hello World +<<<<<<< HEAD <<<<<<< HEAD Hello World

'; ?> ======= @@ -37,5 +38,11 @@ >>>>>>> refs/heads/master >>>>>>> refs/remotes/fmi@github/master +======= + Hello World from FMI

'; ?> + Hello World from Mihail Kopuschu! meshko1989@mail.ru

'; ?> + Hello World, Aleksander Aleksandrov


email:aleksaander_aleksandrov@abv.bg'; ?> + Hello World, Elena Chavdarova


email:elenachavdarova91@gmail.com'; ?> +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 diff --git a/index.php~ b/index.php~ new file mode 100644 index 00000000..f214320c --- /dev/null +++ b/index.php~ @@ -0,0 +1,37 @@ + + + Hello World + + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD + Hello World

'; ?> +======= + Hello World from FMI

'; ?> + Hello World from Mihail Kopuschu! meshko1989@mail.ru

'; ?> + Hello World, Aleksander Aleksandrov


email:aleksaander_aleksandrov@abv.bg'; ?> + Hello World, Elena Chavdarova


email:elenachavdarova91@gmail.com'; ?> + +>>>>>>> refs/heads/master +======= + Hello World from FMI

'; ?> + Hello World from Mihail Kopuschu! meshko1989@mail.ru

'; ?> + Hello World, Aleksander Aleksandrov


email:aleksaander_aleksandrov@abv.bg'; ?> + +>>>>>>> refs/remotes/git hub remote/master +======= + Hello World from FMI

'; ?> + Hello World from Mihail Kopuschu! meshko1989@mail.ru

'; ?> + Hello World, Aleksander Aleksandrov


email:aleksaander_aleksandrov@abv.bg'; ?> + +>>>>>>> refs/heads/master +======= + Hello World from FMI

'; ?> + Hello World from Mihail Kopuschu! meshko1989@mail.ru

'; ?> + Hello World, Aleksander Aleksandrov


email:aleksaander_aleksandrov@abv.bg'; ?> + +>>>>>>> refs/heads/master + + diff --git a/index1.php b/index1.php deleted file mode 100644 index 29dbc016..00000000 --- a/index1.php +++ /dev/null @@ -1 +0,0 @@ -gdfgdfgfd diff --git a/layout.css b/layout.css index be424f98..79d0c3be 100644 --- a/layout.css +++ b/layout.css @@ -1,77 +1,77 @@ @CHARSET "UTF-8"; body, html{ - margin: 0; - padding: 0; + margin: 0; + padding: 0; } body { - text-align: center; - background: yellow; + text-align: center; + background: yellow; } #wrap { - width: 960px; /* 80%;*/ - margin: auto; - text-align: left; + width: 80%; /* 960px; */ + margin: auto; + text-align: left; } #header { - position: relative; - top: 0; - left: 0; - width:100%; - height: 100px; - background: green; + position: relative; + top: 0; + left: 0; + width:100%; + height: 100px; + background: green; } #footer { - clear: both; - width:100%; - height: 60px; - background: cyan; + clear: both; + width:100%; + height: 60px; + background: cyan; } #mainBody { - float: left; - width: 80%; - background: red; + float: left; + width: 80%; + background: red; } #content { - float: right; - width: 80%; - min-height: 300px; - background: brown; + float: right; + width: 80%; + min-height: 300px; + background: brown; } #navSide { - float: left; - width: 20%; - /* display: none; */ + float: left; + width: 20%; + display: block; } #add { - float: right; - width: 20%; - /* display: none; */ - background: blue; + float: right; + width: 20%; + /* display: none; */ + background: blue; } #wrapInner { - width: 100%; - margin: auto; + width: 100%; + margin: auto; } #navTop { - position: absolute; - left: 0; - bottom: 0; - width: 100%; - /* height: 30px; */ - text-align: center; + position: absolute; + left: 0; + bottom: 0; + width: 100%; + /* height: 30px; */ + text-align: center; } .inside { - padding: 5px; + padding: 5px; } \ No newline at end of file diff --git a/module/Album/Module.php b/module/Album/Module.php index fb90d3c0..f80f85be 100644 --- a/module/Album/Module.php +++ b/module/Album/Module.php @@ -1,11 +1,19 @@ >>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 use Album\Model\Album; use Album\Model\AlbumTable; use Zend\Db\ResultSet\ResultSet; use Zend\Db\TableGateway\TableGateway; +<<<<<<< HEAD +======= + +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 class Module { public function getAutoloaderConfig() @@ -26,13 +34,21 @@ public function getConfig() { return include __DIR__ . '/config/module.config.php'; } +<<<<<<< HEAD +======= + +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 // Add this method: public function getServiceConfig() { return array( 'factories' => array( +<<<<<<< HEAD 'Album\Model\AlbumTable' => function($sm) { +======= + 'Album\Model\AlbumTable' => function($sm) { +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 $tableGateway = $sm->get('AlbumTableGateway'); $table = new AlbumTable($tableGateway); return $table; diff --git a/module/Album/config/module.config.php b/module/Album/config/module.config.php index 5111c7ba..b8e804f9 100644 --- a/module/Album/config/module.config.php +++ b/module/Album/config/module.config.php @@ -5,10 +5,15 @@ 'Album\Controller\Album' => 'Album\Controller\AlbumController', ), ), +<<<<<<< HEAD +======= + +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 // The following section is new and should be added to your file 'router' => array( 'routes' => array( 'album' => array( +<<<<<<< HEAD 'type' => 'segment', 'options' => array( 'route' => '/album[/:action][/:id]', @@ -19,11 +24,27 @@ 'defaults' => array( 'controller' => 'Album\Controller\Album', 'action' => 'index', +======= + 'type' => 'segment', + 'options' => array( + 'route' => '/album[/:action][/:id]', + 'constraints' => array( + 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', + 'id' => '[0-9]+', + ), + 'defaults' => array( + 'controller' => 'Album\Controller\Album', + 'action' => 'index', +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 ), ), ), ), ), +<<<<<<< HEAD +======= + +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 'view_manager' => array( 'template_path_stack' => array( 'album' => __DIR__ . '/../view', diff --git a/module/Album/src/Album/Controller/AlbumController.php b/module/Album/src/Album/Controller/AlbumController.php index ea61af7b..29742b07 100644 --- a/module/Album/src/Album/Controller/AlbumController.php +++ b/module/Album/src/Album/Controller/AlbumController.php @@ -3,6 +3,7 @@ use Zend\Mvc\Controller\AbstractActionController; use Zend\View\Model\ViewModel; +<<<<<<< HEAD use Album\Model\Album; // <-- Add this import use Album\Form\AlbumForm; // <-- Add this import @@ -26,6 +27,24 @@ public function indexAction() )); } +======= +use Album\Model\Album; // <-- Add this import +use Album\Form\AlbumForm; // <-- Add this import + +class AlbumController extends AbstractActionController +{ + + protected $albumTable; + + public function indexAction() + { + return new ViewModel(array( + 'albums' => $this->getAlbumTable()->fetchAll(), + )); + } + + // Add content to this method: +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 public function addAction() { $form = new AlbumForm(); @@ -48,6 +67,10 @@ public function addAction() return array('form' => $form); } +<<<<<<< HEAD +======= + // Add content to this method: +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 public function editAction() { $id = (int) $this->params()->fromRoute('id', 0); @@ -58,7 +81,11 @@ public function editAction() } $album = $this->getAlbumTable()->getAlbum($id); +<<<<<<< HEAD $form = new AlbumForm(); +======= + $form = new AlbumForm(); +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 $form->bind($album); $form->get('submit')->setAttribute('value', 'Edit'); @@ -81,6 +108,10 @@ public function editAction() ); } +<<<<<<< HEAD +======= + // Add content to the following method: +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 public function deleteAction() { $id = (int) $this->params()->fromRoute('id', 0); @@ -102,8 +133,25 @@ public function deleteAction() } return array( +<<<<<<< HEAD 'id' => $id, 'album' => $this->getAlbumTable()->getAlbum($id) ); } +======= + 'id' => $id, + 'album' => $this->getAlbumTable()->getAlbum($id) + ); + } + +// module/Album/src/Album/Controller/AlbumController.php: + public function getAlbumTable() + { + if (!$this->albumTable) { + $sm = $this->getServiceLocator(); + $this->albumTable = $sm->get('Album\Model\AlbumTable'); + } + return $this->albumTable; + } +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 } \ No newline at end of file diff --git a/module/Album/src/Album/Form/AlbumForm.php b/module/Album/src/Album/Form/AlbumForm.php index 64c13259..3e1f2613 100644 --- a/module/Album/src/Album/Form/AlbumForm.php +++ b/module/Album/src/Album/Form/AlbumForm.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD setAttribute('method', 'post'); + $this->add(array( + 'name' => 'id', + 'attributes' => array( + 'type' => 'hidden', + ), + )); + $this->add(array( + 'name' => 'artist', + 'attributes' => array( + 'type' => 'text', + ), + 'options' => array( + 'label' => 'Artist', + ), + )); + $this->add(array( + 'name' => 'title', + 'attributes' => array( + 'type' => 'text', + ), + 'options' => array( + 'label' => 'Title', + ), + )); + $this->add(array( + 'name' => 'submit', + 'attributes' => array( + 'type' => 'submit', + 'value' => 'Go', + 'id' => 'submitbutton', + ), + )); + } +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 } \ No newline at end of file diff --git a/module/Album/src/Album/Model/Album.php b/module/Album/src/Album/Model/Album.php index 23c4083f..15c4261d 100644 --- a/module/Album/src/Album/Model/Album.php +++ b/module/Album/src/Album/Model/Album.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD inputFilter; } +======= +id = (isset($data['id'])) ? $data['id'] : null; + $this->artist = (isset($data['artist'])) ? $data['artist'] : null; + $this->title = (isset($data['title'])) ? $data['title'] : null; + } + + // Add the following method: + public function getArrayCopy() + { + return get_object_vars($this); + } + + // Add content to this method: + public function setInputFilter(InputFilterInterface $inputFilter) + { + throw new \Exception("Not used"); + } + + public function getInputFilter() + { + if (!$this->inputFilter) { + $inputFilter = new InputFilter(); + $factory = new InputFactory(); + + $inputFilter->add($factory->createInput(array( + 'name' => 'id', + 'required' => true, + 'filters' => array( + array('name' => 'Int'), + ), + ))); + + $inputFilter->add($factory->createInput(array( + 'name' => 'artist', + 'required' => true, + 'filters' => array( + array('name' => 'StripTags'), + array('name' => 'StringTrim'), + ), + 'validators' => array( + array( + 'name' => 'StringLength', + 'options' => array( + 'encoding' => 'UTF-8', + 'min' => 1, + 'max' => 100, + ), + ), + ), + ))); + + $inputFilter->add($factory->createInput(array( + 'name' => 'title', + 'required' => true, + 'filters' => array( + array('name' => 'StripTags'), + array('name' => 'StringTrim'), + ), + 'validators' => array( + array( + 'name' => 'StringLength', + 'options' => array( + 'encoding' => 'UTF-8', + 'min' => 1, + 'max' => 100, + ), + ), + ), + ))); + + $this->inputFilter = $inputFilter; + } + + return $this->inputFilter; + } +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 } \ No newline at end of file diff --git a/module/Album/src/Album/Model/AlbumTable.php b/module/Album/src/Album/Model/AlbumTable.php index 41c5dd1a..0f15859d 100644 --- a/module/Album/src/Album/Model/AlbumTable.php +++ b/module/Album/src/Album/Model/AlbumTable.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD tableGateway->delete(array('id' => $id)); } +======= +tableGateway = $tableGateway; + } + + public function fetchAll() + { + $resultSet = $this->tableGateway->select(); + return $resultSet; + } + + public function getAlbum($id) + { + $id = (int) $id; + $rowset = $this->tableGateway->select(array('id' => $id)); + $row = $rowset->current(); + if (!$row) { + throw new \Exception("Could not find row $id"); + } + return $row; + } + + public function saveAlbum(Album $album) + { + $data = array( + 'artist' => $album->artist, + 'title' => $album->title, + ); + + $id = (int)$album->id; + if ($id == 0) { + $this->tableGateway->insert($data); + } else { + if ($this->getAlbum($id)) { + $this->tableGateway->update($data, array('id' => $id)); + } else { + throw new \Exception('Form id does not exist'); + } + } + } + + public function deleteAlbum($id) + { + $this->tableGateway->delete(array('id' => $id)); + } +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 } \ No newline at end of file diff --git a/module/Album/view/album/album/add.phtml b/module/Album/view/album/album/add.phtml index a93df417..8862564e 100644 --- a/module/Album/view/album/album/add.phtml +++ b/module/Album/view/album/album/add.phtml @@ -1,3 +1,4 @@ +<<<<<<< HEAD headTitle($title); @@ -13,4 +14,24 @@ echo $this->formHidden($form->get('id')); echo $this->formRow($form->get('title')); echo $this->formRow($form->get('artist')); echo $this->formSubmit($form->get('submit')); +======= +

The view script add.phtml

+headTitle($title); +?> +

escapeHtml($title); ?>

+form; +$form->setAttribute('action', $this->url('album', array('action' => 'add'))); +$form->prepare(); + +echo $this->form()->openTag($form); +echo $this->formHidden($form->get('id')); +echo $this->formRow($form->get('title')); +echo $this->formRow($form->get('artist')); +echo $this->formSubmit($form->get('submit')); +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 echo $this->form()->closeTag(); \ No newline at end of file diff --git a/module/Album/view/album/album/delete.phtml b/module/Album/view/album/album/delete.phtml index 40145813..340d6c2a 100644 --- a/module/Album/view/album/album/delete.phtml +++ b/module/Album/view/album/album/delete.phtml @@ -1,3 +1,4 @@ +<<<<<<< HEAD url('album', array( +======= +

The view script delete.phtml

+ +headTitle($title); +?> +

escapeHtml($title); ?>

+ +

Are you sure that you want to delete + 'escapeHtml($album->title); ?>' by + 'escapeHtml($album->artist); ?>'? +

+url('album', array( + 'action' => 'delete', + 'id' => $this->id, +)); +?> +
+
+ + + +
+>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951
\ No newline at end of file diff --git a/module/Album/view/album/album/edit.phtml b/module/Album/view/album/album/edit.phtml index a9c06653..7599bc4b 100644 --- a/module/Album/view/album/album/edit.phtml +++ b/module/Album/view/album/album/edit.phtml @@ -1,3 +1,4 @@ +<<<<<<< HEAD formHidden($form->get('id')); echo $this->formRow($form->get('title')); echo $this->formRow($form->get('artist')); echo $this->formSubmit($form->get('submit')); +======= +

The view script edit.phtml

+ +headTitle($title); +?> +

escapeHtml($title); ?>

+ +form; +$form->setAttribute('action', $this->url( + 'album', + array( + 'action' => 'edit', + 'id' => $this->id, + ) +)); +$form->prepare(); + +echo $this->form()->openTag($form); +echo $this->formHidden($form->get('id')); +echo $this->formRow($form->get('title')); +echo $this->formRow($form->get('artist')); +echo $this->formSubmit($form->get('submit')); +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 echo $this->form()->closeTag(); \ No newline at end of file diff --git a/module/Album/view/album/album/index.phtml b/module/Album/view/album/album/index.phtml index 30085ac4..ce5bc2eb 100644 --- a/module/Album/view/album/album/index.phtml +++ b/module/Album/view/album/album/index.phtml @@ -1,3 +1,4 @@ +<<<<<<< HEAD headTitle($title); @@ -25,4 +26,35 @@ $this->headTitle($title); +======= +headTitle($title); +?> +

escapeHtml($title); ?>

+

+ Add new album +

+ + + + + + + + + + + + + + +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951
TitleArtist 
escapeHtml($album->title);?>escapeHtml($album->artist);?> + Edit + Delete +
\ No newline at end of file diff --git a/module/AlexanderAlexandrov/Module.php b/module/AlexanderAlexandrov/Module.php new file mode 100644 index 00000000..0c89ee03 --- /dev/null +++ b/module/AlexanderAlexandrov/Module.php @@ -0,0 +1,24 @@ + 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'; + } +} \ No newline at end of file diff --git a/module/AlexanderAlexandrov/autoload_classmap.php b/module/AlexanderAlexandrov/autoload_classmap.php new file mode 100644 index 00000000..dad330e6 --- /dev/null +++ b/module/AlexanderAlexandrov/autoload_classmap.php @@ -0,0 +1,2 @@ + array( + 'invokables' => array( + 'AlexanderAlexandrov\Controller\Index' => 'AlexanderAlexandrov\Controller\IndexController', + ), + ), + + // The following section is new and should be added to your file + 'router' => array( + 'routes' => array( + 'alexander_alexandrov' => array( + 'type' => 'segment', + 'options' => array( + 'route' => '/alexander-alexandrov[/:action][/:id]', + 'constraints' => array( + 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', + 'id' => '[0-9]+', + ), + 'defaults' => array( + 'controller' => 'AlexanderAlexandrov\Controller\Index', + 'action' => 'index', + ), + ), + ), + ), + ), + + 'view_manager' => array( + 'template_path_stack' => array( + 'alexander_alexandrov' => __DIR__ . '/../view', + ), + ), +); \ No newline at end of file diff --git a/module/AlexanderAlexandrov/src/AlexanderAlexandrov/Controller/IndexController.php b/module/AlexanderAlexandrov/src/AlexanderAlexandrov/Controller/IndexController.php new file mode 100644 index 00000000..6341a878 --- /dev/null +++ b/module/AlexanderAlexandrov/src/AlexanderAlexandrov/Controller/IndexController.php @@ -0,0 +1,21 @@ +I am the index.phtml in AlexanderAlexandrov module \ No newline at end of file diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php index 16edf711..dfee07b9 100644 --- a/module/Application/config/module.config.php +++ b/module/Application/config/module.config.php @@ -15,7 +15,12 @@ 'options' => array( 'route' => '/', 'defaults' => array( +<<<<<<< HEAD 'controller' => 'Album\Controller\Album', // <-- change here +======= +// 'controller' => 'Album\Controller\Album', + 'controller' => 'Application\Controller\Index', +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 'action' => 'index', ), ), @@ -69,7 +74,16 @@ ), 'controllers' => array( 'invokables' => array( +<<<<<<< HEAD 'Application\Controller\Index' => 'Application\Controller\IndexController' +======= + 'Application\Controller\Index' => 'Application\Controller\IndexController', +// 'Application\Controller\ZhelyanGuglev' => 'Application\Controller\ZhelyanGuglevController', +// 'Application\Controller\AlexanderAlexandrov' => 'Application\Controller\AlexanderAlexandrovController' +// 'Application\Controller\Stoyan' => 'Application\Controller\StoyanController', // <-- Added by me +// 'Application\Controller\StoyanCheresharov' => 'Application\Controller\StoyanCheresharovController', // <-- Added by me +// 'Application\Controller\FmiStudent' => 'Application\Controller\FmiStudentController', // <-- Added by me +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 ), ), 'view_manager' => array( @@ -80,7 +94,13 @@ 'exception_template' => 'error/index', 'template_map' => array( 'layout/layout' => __DIR__ . '/../view/layout/layout.phtml', +<<<<<<< HEAD 'application/index/index' => __DIR__ . '/../view/application/index/index.phtml', +======= + 'layout/student' => __DIR__ . '/../view/layout/student.phtml', + 'application/index/index' => __DIR__ . '/../view/application/index/index.phtml', +// 'application/stoyan/index' => __DIR__ . '/../view/application/stoyan/index.phtml', // <-- Added by me +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 'error/404' => __DIR__ . '/../view/error/404.phtml', 'error/index' => __DIR__ . '/../view/error/index.phtml', ), diff --git a/module/Application/src/Application/Controller/AlbumController.php b/module/Application/src/Application/Controller/AlbumController.php new file mode 100644 index 00000000..9a051293 --- /dev/null +++ b/module/Application/src/Application/Controller/AlbumController.php @@ -0,0 +1,111 @@ + $this->getAlbumTable()->fetchAll(), + )); + } + + public function addAction() + { + $form = new AlbumForm(); + $form->get('submit')->setValue('Add'); + + $request = $this->getRequest(); + if ($request->isPost()) { + $album = new Album(); + $form->setInputFilter($album->getInputFilter()); + $form->setData($request->getPost()); + + if ($form->isValid()) { + $album->exchangeArray($form->getData()); + $this->getAlbumTable()->saveAlbum($album); + + // Redirect to list of albums + return $this->redirect()->toRoute('album'); + } + } + return array('form' => $form); + } + + public function editAction() + { + $id = (int) $this->params()->fromRoute('id', 0); + if (!$id) { + return $this->redirect()->toRoute('album', array( + 'action' => 'add' + )); + } + $album = $this->getAlbumTable()->getAlbum($id); + + $form = new AlbumForm(); + $form->bind($album); + $form->get('submit')->setAttribute('value', 'Edit'); + + $request = $this->getRequest(); + if ($request->isPost()) { + $form->setInputFilter($album->getInputFilter()); + $form->setData($request->getPost()); + + if ($form->isValid()) { + $this->getAlbumTable()->saveAlbum($form->getData()); + + // Redirect to list of albums + return $this->redirect()->toRoute('album'); + } + } + + return array( + 'id' => $id, + 'form' => $form, + ); + } + + public function deleteAction() + { + $id = (int) $this->params()->fromRoute('id', 0); + if (!$id) { + return $this->redirect()->toRoute('album'); + } + + $request = $this->getRequest(); + if ($request->isPost()) { + $del = $request->getPost('del', 'No'); + + if ($del == 'Yes') { + $id = (int) $request->getPost('id'); + $this->getAlbumTable()->deleteAlbum($id); + } + + // Redirect to list of albums + return $this->redirect()->toRoute('album'); + } + + return array( + 'id' => $id, + 'album' => $this->getAlbumTable()->getAlbum($id) + ); + } + + public function getAlbumTable() + { + if (!$this->albumTable) + { + $sm = $this->getServiceLocator(); + $this->albumTable = $sm->get('Album\Model\AlbumTable'); + } + return $this->albumTable; + } + } \ No newline at end of file diff --git a/module/Application/src/Application/Controller/AlexanderAlexandrov.php b/module/Application/src/Application/Controller/AlexanderAlexandrov.php new file mode 100644 index 00000000..fb576e16 --- /dev/null +++ b/module/Application/src/Application/Controller/AlexanderAlexandrov.php @@ -0,0 +1,21 @@ + 1, + 'title' => 'FMI Student' + ); + } +} diff --git a/module/Application/src/Application/Controller/StoyanCheresharovController.php b/module/Application/src/Application/Controller/StoyanCheresharovController.php new file mode 100644 index 00000000..bcc0b20a --- /dev/null +++ b/module/Application/src/Application/Controller/StoyanCheresharovController.php @@ -0,0 +1,29 @@ + 1, + 'title' => 'I have to add' + ); + } +} diff --git a/module/Application/src/Application/Controller/StoyanController.php b/module/Application/src/Application/Controller/StoyanController.php new file mode 100644 index 00000000..7cb22a56 --- /dev/null +++ b/module/Application/src/Application/Controller/StoyanController.php @@ -0,0 +1,29 @@ + 1, + 'title' => 'I have to add' + ); + } +} diff --git a/module/Application/src/Application/Controller/ZhelyanGuglev.php b/module/Application/src/Application/Controller/ZhelyanGuglev.php new file mode 100644 index 00000000..13c0975b --- /dev/null +++ b/module/Application/src/Application/Controller/ZhelyanGuglev.php @@ -0,0 +1,21 @@ +Alexander Alexandrov \ No newline at end of file diff --git a/module/Application/view/application/fmi-student/add.phtml b/module/Application/view/application/fmi-student/add.phtml new file mode 100644 index 00000000..4e378735 --- /dev/null +++ b/module/Application/view/application/fmi-student/add.phtml @@ -0,0 +1,2 @@ +

I am in add.phtml

+

title; ?>

\ No newline at end of file diff --git a/module/Application/view/application/fmi-student/index.phtml b/module/Application/view/application/fmi-student/index.phtml new file mode 100644 index 00000000..7928af91 --- /dev/null +++ b/module/Application/view/application/fmi-student/index.phtml @@ -0,0 +1 @@ +

I am index.phtml

\ No newline at end of file diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml index 49d3b1ab..999b406e 100644 --- a/module/Application/view/application/index/index.phtml +++ b/module/Application/view/application/index/index.phtml @@ -1,4 +1,7 @@ +<<<<<<< HEAD

Hello world

+======= +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951

translate('Welcome to %sZend Framework 2%s'), '', '') ?>

translate('Congratulations! You have successfully installed the %sZF2 Skeleton Application%s. You are currently running Zend Framework version %s. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.'), '', '', \Zend\Version\Version::VERSION) ?>

diff --git a/module/Application/view/application/stoyan-cheresharov/add.phtml b/module/Application/view/application/stoyan-cheresharov/add.phtml new file mode 100644 index 00000000..148efd0f --- /dev/null +++ b/module/Application/view/application/stoyan-cheresharov/add.phtml @@ -0,0 +1 @@ +

title; ?>

\ No newline at end of file diff --git a/ContributingStudent.php b/module/Application/view/application/stoyan-cheresharov/index.phtml similarity index 61% rename from ContributingStudent.php rename to module/Application/view/application/stoyan-cheresharov/index.phtml index e2786a66..06b87d90 100644 --- a/ContributingStudent.php +++ b/module/Application/view/application/stoyan-cheresharov/index.phtml @@ -3,6 +3,6 @@ PHP Test - Contributing Student.

'; ?> + Hello World

'; ?> \ No newline at end of file diff --git a/module/Application/view/application/stoyan/add.phtml b/module/Application/view/application/stoyan/add.phtml new file mode 100644 index 00000000..c21290df --- /dev/null +++ b/module/Application/view/application/stoyan/add.phtml @@ -0,0 +1,2 @@ +The id is '.$this->id.''; \ No newline at end of file diff --git a/module/Application/view/application/stoyan/index.phtml b/module/Application/view/application/stoyan/index.phtml new file mode 100644 index 00000000..3b2caaa1 --- /dev/null +++ b/module/Application/view/application/stoyan/index.phtml @@ -0,0 +1 @@ +

Stoyan

\ No newline at end of file diff --git a/module/Application/view/application/zhelyan-guglev/index.phtml b/module/Application/view/application/zhelyan-guglev/index.phtml new file mode 100644 index 00000000..665f8411 --- /dev/null +++ b/module/Application/view/application/zhelyan-guglev/index.phtml @@ -0,0 +1 @@ +

Zhelyan Guglev

\ No newline at end of file diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index 86561a26..7323d306 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -47,7 +47,11 @@
diff --git a/module/Application/view/layout/student.phtml b/module/Application/view/layout/student.phtml new file mode 100644 index 00000000..44faf4b7 --- /dev/null +++ b/module/Application/view/layout/student.phtml @@ -0,0 +1,11 @@ + + + PHP Test + + + Hello World

'; ?> + + content; ?> + + + \ No newline at end of file diff --git a/module/FmiStudent/Module.php b/module/FmiStudent/Module.php new file mode 100644 index 00000000..567542e1 --- /dev/null +++ b/module/FmiStudent/Module.php @@ -0,0 +1,24 @@ + 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'; + } +} \ No newline at end of file diff --git a/module/FmiStudent/autoload_classmap.php b/module/FmiStudent/autoload_classmap.php new file mode 100644 index 00000000..dad330e6 --- /dev/null +++ b/module/FmiStudent/autoload_classmap.php @@ -0,0 +1,2 @@ + array( + 'invokables' => array( + 'FmiStudent\Controller\Index' => 'FmiStudent\Controller\IndexController', + ), + ), + + // The following section is new and should be added to your file + 'router' => array( + 'routes' => array( + 'fmi_student' => array( + 'type' => 'segment', + 'options' => array( + 'route' => '/fmi-student[/:action][/:id]', +// 'route' => '/fmi-student[/:controller][/:action]', + 'constraints' => array( + 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', + 'id' => '[0-9]+', + ), + 'defaults' => array( + 'controller' => 'FmiStudent\Controller\Index', + 'action' => 'index', + ), + ), + ), + ), + ), + + 'view_manager' => array( + 'template_path_stack' => array( + 'fmi_student' => __DIR__ . '/../view', + ), + ), +); \ No newline at end of file diff --git a/module/FmiStudent/src/FmiStudent/Controller/IndexController.php b/module/FmiStudent/src/FmiStudent/Controller/IndexController.php new file mode 100644 index 00000000..34a26fb7 --- /dev/null +++ b/module/FmiStudent/src/FmiStudent/Controller/IndexController.php @@ -0,0 +1,28 @@ +setTemplate('layout/custom'); + $this->layout('layout/student'); // change the layout. DOn't forget to add it in modeule.config.php + return $viewModel; + } +} diff --git a/module/FmiStudent/view/fmi-student/index/index.phtml b/module/FmiStudent/view/fmi-student/index/index.phtml new file mode 100644 index 00000000..f882a418 --- /dev/null +++ b/module/FmiStudent/view/fmi-student/index/index.phtml @@ -0,0 +1 @@ +

I am in index.phtml in the module FmiStudent

\ No newline at end of file diff --git a/module/FmiStudent/view/fmi-student/index/student.phtml b/module/FmiStudent/view/fmi-student/index/student.phtml new file mode 100644 index 00000000..78374cef --- /dev/null +++ b/module/FmiStudent/view/fmi-student/index/student.phtml @@ -0,0 +1 @@ +

I am in the student.phtml

\ No newline at end of file diff --git a/module/GyunerZeki/Module.php b/module/GyunerZeki/Module.php new file mode 100644 index 00000000..8944ffb7 --- /dev/null +++ b/module/GyunerZeki/Module.php @@ -0,0 +1,24 @@ + 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'; + } +} \ No newline at end of file diff --git a/module/GyunerZeki/autoload_classmap.php b/module/GyunerZeki/autoload_classmap.php new file mode 100644 index 00000000..dad330e6 --- /dev/null +++ b/module/GyunerZeki/autoload_classmap.php @@ -0,0 +1,2 @@ + array( + 'invokables' => array( + 'GyunerZeki\Controller\Index' => 'GyunerZeki\Controller\IndexController', + ), + ), + + 'router' => array( + 'routes' => array( + 'gyuner_zeki' => array( + 'type' => 'segment', + 'options' => array( + 'route' => '/gyuner-zeki[/:action][/:id]', + 'constraints' => array( + 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', + 'id' => '[0-9]+', + ), + 'defaults' => array( + 'controller' => 'GyunerZeki\Controller\Index', + 'action' => 'index', + ), + ), + ), + ), + ), + + 'view_manager' => array( + 'template_path_stack' => array( + 'gyuner_zeki' => __DIR__ . '/../view', + ), + ), +); \ No newline at end of file diff --git a/module/GyunerZeki/src/GyunerZeki/Controller/IndexController.php b/module/GyunerZeki/src/GyunerZeki/Controller/IndexController.php new file mode 100644 index 00000000..c3875df5 --- /dev/null +++ b/module/GyunerZeki/src/GyunerZeki/Controller/IndexController.php @@ -0,0 +1,21 @@ +I am the index.phtml in GyunerZeki module \ No newline at end of file diff --git a/module/StoyanCheresharov/Module.php b/module/StoyanCheresharov/Module.php new file mode 100644 index 00000000..b34e8ac0 --- /dev/null +++ b/module/StoyanCheresharov/Module.php @@ -0,0 +1,24 @@ + 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'; + } +} \ No newline at end of file diff --git a/module/StoyanCheresharov/autoload_classmap.php b/module/StoyanCheresharov/autoload_classmap.php new file mode 100644 index 00000000..dad330e6 --- /dev/null +++ b/module/StoyanCheresharov/autoload_classmap.php @@ -0,0 +1,2 @@ + array( + 'invokables' => array( + 'StoyanCheresharov\Controller\Index' => 'StoyanCheresharov\Controller\IndexController', + ), + ), + + // The following section is new and should be added to your file + 'router' => array( + 'routes' => array( + 'stoyan_cheresharov' => array( + 'type' => 'segment', + 'options' => array( + 'route' => '/stoyan-cheresharov[/:action][/:id]', + 'constraints' => array( + 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', + 'id' => '[0-9]+', + ), + 'defaults' => array( + 'controller' => 'StoyanCheresharov\Controller\Index', + 'action' => 'index', + ), + ), + ), + ), + ), + + 'view_manager' => array( + 'template_map' => array( + // 'layout/layout' => __DIR__ . '/../view/layout/layout.phtml', // the entire app is using it + // 'layout/layout' => __DIR__ . '/../view/layout/student.phtml', + // 'application/index/index' => __DIR__ . '/../view/application/index/index.phtml', + // 'application/stoyan/index' => __DIR__ . '/../view/application/stoyan/index.phtml', // <-- Added by me + // 'error/404' => __DIR__ . '/../view/error/404.phtml', + // 'error/index' => __DIR__ . '/../view/error/index.phtml', + ), + 'template_path_stack' => array( + 'stoyan_cheresharov' => __DIR__ . '/../view', + ), + ), +); \ No newline at end of file diff --git a/module/StoyanCheresharov/src/StoyanCheresharov/Controller/IndexController.php b/module/StoyanCheresharov/src/StoyanCheresharov/Controller/IndexController.php new file mode 100644 index 00000000..5b5e8723 --- /dev/null +++ b/module/StoyanCheresharov/src/StoyanCheresharov/Controller/IndexController.php @@ -0,0 +1,21 @@ + + + Stoyan Cheresharov Layout + + + Stoyan Cheresharov layout

'; ?> + + content; ?> + + + \ No newline at end of file diff --git a/module/StoyanCheresharov/view/stoyan-cheresharov/index/index.phtml b/module/StoyanCheresharov/view/stoyan-cheresharov/index/index.phtml new file mode 100644 index 00000000..cea76f98 --- /dev/null +++ b/module/StoyanCheresharov/view/stoyan-cheresharov/index/index.phtml @@ -0,0 +1 @@ +

I am the index.phtml in StoyanCheresharov module

\ No newline at end of file diff --git a/module/StudentBg/Module.php b/module/StudentBg/Module.php new file mode 100644 index 00000000..580bc797 --- /dev/null +++ b/module/StudentBg/Module.php @@ -0,0 +1,24 @@ + 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'; + } +} \ No newline at end of file diff --git a/module/StudentBg/autoload_classmap.php b/module/StudentBg/autoload_classmap.php new file mode 100644 index 00000000..dad330e6 --- /dev/null +++ b/module/StudentBg/autoload_classmap.php @@ -0,0 +1,2 @@ + array( + 'invokables' => array( + 'StudentBg\Controller\Index' => 'StudentBg\Controller\IndexController', + ), + ), + + // The following section is new and should be added to your file + 'router' => array( + 'routes' => array( + 'student_bg' => array( + 'type' => 'segment', + 'options' => array( + 'route' => '/student-bg[/:action][/:id]', + 'constraints' => array( + 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', + 'id' => '[0-9]+', + ), + 'defaults' => array( + 'controller' => 'StudentBg\Controller\Index', + 'action' => 'index', + ), + ), + ), + ), + ), + + 'view_manager' => array( + 'template_path_stack' => array( + 'student_bg' => __DIR__ . '/../view', + ), + ), +); \ No newline at end of file diff --git a/module/StudentBg/src/StudentBg/Controller/IndexController.php b/module/StudentBg/src/StudentBg/Controller/IndexController.php new file mode 100644 index 00000000..a72cd8db --- /dev/null +++ b/module/StudentBg/src/StudentBg/Controller/IndexController.php @@ -0,0 +1,21 @@ +I am the index.phtml in StudentBg module \ No newline at end of file diff --git a/module/ZhelyanGuglev/Module.php b/module/ZhelyanGuglev/Module.php new file mode 100644 index 00000000..d5993803 --- /dev/null +++ b/module/ZhelyanGuglev/Module.php @@ -0,0 +1,24 @@ + 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'; + } +} \ No newline at end of file diff --git a/module/ZhelyanGuglev/autoload_classmap.php b/module/ZhelyanGuglev/autoload_classmap.php new file mode 100644 index 00000000..dad330e6 --- /dev/null +++ b/module/ZhelyanGuglev/autoload_classmap.php @@ -0,0 +1,2 @@ + array( + 'invokables' => array( + 'ZhelyanGuglev\Controller\Index' => 'ZhelyanGuglev\Controller\IndexController', + ), + ), + + // The following section is new and should be added to your file + 'router' => array( + 'routes' => array( + 'zhelyan_guglev' => array( // NOT 'album'! Give a different name for the route + 'type' => 'segment', + 'options' => array( + 'route' => '/zhelyan-guglev[/:action][/:id]', + 'constraints' => array( + 'action' => '[a-zA-Z][a-zA-Z0-9_-]*', + 'id' => '[0-9]+', + ), + 'defaults' => array( + 'controller' => 'ZhelyanGuglev\Controller\Index', + 'action' => 'index', + ), + ), + ), + ), + ), + + 'view_manager' => array( + 'template_map' => array( + // 'layout/layout' => __DIR__ . '/../view/layout/layout.phtml', // the entire app is using it + // 'layout/layout' => __DIR__ . '/../view/layout/student.phtml', + // 'application/index/index' => __DIR__ . '/../view/application/index/index.phtml', + // 'application/stoyan/index' => __DIR__ . '/../view/application/stoyan/index.phtml', // <-- Added by me + // 'error/404' => __DIR__ . '/../view/error/404.phtml', + // 'error/index' => __DIR__ . '/../view/error/index.phtml', + ), + 'template_path_stack' => array( + 'zhelyan_guglev' => __DIR__ . '/../view', + ), + ), +); \ No newline at end of file diff --git a/module/ZhelyanGuglev/src/ZhelyanGuglev/Controller/IndexController.php b/module/ZhelyanGuglev/src/ZhelyanGuglev/Controller/IndexController.php new file mode 100644 index 00000000..03bfeb6c --- /dev/null +++ b/module/ZhelyanGuglev/src/ZhelyanGuglev/Controller/IndexController.php @@ -0,0 +1,21 @@ +I am the index.phtml in ZhelyanGuglev module \ No newline at end of file diff --git a/navcontainer.css b/navcontainer.css index 59c4e4fd..56c1e7d6 100644 --- a/navcontainer.css +++ b/navcontainer.css @@ -1,84 +1,84 @@ /*In order to make it work in IE we need to load also */ /* */ #navcontainer { -/* background:url(../images/menu_bg.jpg); */ +/* background:url(../images/menu_bg.jpg); */ } #navcontainer ul { padding: 0; margin: 0; list-style: none; - overflow: visible; - z-index: 5; + overflow: visible; + z-index: 5; } #navcontainer a { display:block; -/* color:#000000; */ - text-align:center; - text-decoration: none; - font-size: 10pt; /*12px = 9pt*/ - width: 90px; - height: 51px; - padding-top:20px; - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; -/* background: yellow; */ +/* color:#000000; */ + text-align:center; + text-decoration: none; + font-size: 10pt; /*12px = 9pt*/ + width: 90px; + height: 51px; + padding-top:20px; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; +/* background: yellow; */ } #navcontainer a:visited { -/* color:#000000; */ +/* color:#000000; */ } #navcontainer a:hover { -/* background:green url(../images/menu-bg-hvr.gif) no-repeat scroll 0 0; */ -/* background: transparent url("../images/nav_center_hover.png") repeat-x scroll 0 0; */ - background: white url("../images/nav_center_hover.png") repeat-x scroll 0 0; - color:#954a04; +/* background:green url(../images/menu-bg-hvr.gif) no-repeat scroll 0 0; */ +/* background: transparent url("../images/nav_center_hover.png") repeat-x scroll 0 0; */ + background: white url("../images/nav_center_hover.png") repeat-x scroll 0 0; + color:#954a04; } /* Active Menus */ ul li.active a{ -/* color:#000; */ +/* color:#000; */ } ul li.active a:visited { -/* color:#000; */ +/* color:#000; */ } ul li.active a:hover { -/* color:#000; */ +/* color:#000; */ } /*If we need different settings for the pop-up menus*/ #navcontainer li ul a { display:block; -/* color:#000000; */ - text-align:center; - text-decoration: none; - font-size: 10pt; - width: 120px; /* auto; */ - height: 30px; /* auto; */ - padding-top:15px; - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; -/* border-top: 1px solid #aaaaaa; */ - border-bottom: 1px solid #aaaaaa; - background: #eeeeee; /* Here you change the background color of the popup menu*/ +/* color:#000000; */ + text-align:center; + text-decoration: none; + font-size: 10pt; + width: 120px; /* auto; */ + height: 30px; /* auto; */ + padding-top:15px; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; +/* border-top: 1px solid #aaaaaa; */ + border-bottom: 1px solid #aaaaaa; + background: #eeeeee; /* Here you change the background color of the popup menu*/ } #navcontainer li ul a:visited { -/* color:#000000; */ +/* color:#000000; */ } #navcontainer li ul a:hover { - background:#aaaaaa; /* url(../images/menu-bg-hvr.gif); */ - color:#954a04; + background:#aaaaaa; /* url(../images/menu-bg-hvr.gif); */ + color:#954a04; } /* End of popup menu*/ /* this makes the menu to become horizontal */ #navcontainer li { float: left; - width: 95px; + width: 95px; } /* for the next level we move it to the right "indent" Controls how far right are the next menus @@ -86,7 +86,7 @@ Bigger number more right the longest situation was margin: -1em 0 0 8em; - it was working for ALL LEVELS PERFECT -2.2em 0 0 8em; the first number controls the vertila position bigger negative numbers higher will be the next level */ -#navcontainer li ul { /* the first number moves the second level up verticaly and down, thest number moves left right horizontaly*/ +#navcontainer li ul { /* the first number moves the second level up verticaly and down, thest number moves left right horizontaly*/ margin: -0.8em 0 0 0; } #navcontainer li ul ul { @@ -99,7 +99,7 @@ the longest situation was margin: -1em 0 0 8em; - it was working for ALL LEVELS margin: -2.5em 0 0 8.5em; } #navcontainer li ul ul ul ul ul{ - margin: -2.5em 0 0 8.5em; + margin: -2.5em 0 0 8.5em; } /* We starting to hide them now this moves the lists very far left*/ @@ -109,14 +109,13 @@ the longest situation was margin: -1em 0 0 8em; - it was working for ALL LEVELS left: -999em; } -#navcontainer li:hover ul ul, #navcontainer li:hover ul ul ul, #navcontainer li:hover ul ul ul ul, #navcontainer li.sfhover ul ul, #navcontainer li.sfhover ul ul ul, #navcontainer li.sfhover ul ul ul ul { +#navcontainer li:hover ul ul, #navcontainer li:hover ul ul ul, #navcontainer li:hover ul ul ul ul, #navcontainer li.sfhover ul ul, #navcontainer li.sfhover ul ul ul, #navcontainer li.sfhover ul ul ul ul { left: -999em; } /* this brings the list back Can be done only with one expression this and the javascript is for IE The java script attaches class sfhover to li*/ -#navcontainer li:hover ul, #navcontainer li li:hover ul, #navcontainer li li li:hover ul, #navcontainer li li li li:hover ul, #navcontainer li.sfhover ul, #navcontainer li li.sfhover ul, #navcontainer li li li.sfhover ul, #navcontainer li li li li.sfhover ul { +#navcontainer li:hover ul, #navcontainer li li:hover ul, #navcontainer li li li:hover ul, #navcontainer li li li li:hover ul, #navcontainer li.sfhover ul, #navcontainer li li.sfhover ul, #navcontainer li li li.sfhover ul, #navcontainer li li li li.sfhover ul { left: auto; - z-index: 1000; -} - + z-index: 1000; +} \ No newline at end of file diff --git a/phpcloud_local_php_file_upload_instructions.txt b/phpcloud_local_php_file_upload_instructions.txt new file mode 100644 index 00000000..caec00fe --- /dev/null +++ b/phpcloud_local_php_file_upload_instructions.txt @@ -0,0 +1,30 @@ +How to upload local.php file for zend skeleton application on phpcloud.com step by step tutorial +------------------------------------------------------------------------------------------------ + + +1) Download FileZilla from: http://filezilla-project.org/ +2) Open FileZilla -> Settings: + Connection + SFTP + Add new key... + +3) And add your private key for phpcloud.com. + (FileZilla is able to convert non PuTTy compatible keys too like those + generated with github ssh keygen application.) + +4) Press OK. + +5) In host text box type: your-container-name.my.phpcloud.com +6) In user text box type: your-container-name +7) In password password box type: your-phpcloud-password +8) In port text box type: 22 +9) Press "Quick Connect" + +10) On the remote server open: applications/your-project-name/config/autoload directory. +11) Drag and drop your local.php file there. + +12) Test the result - visit: http://your-container-name.my.phpcloud.com/your-project-name/album + +.......................................... + +made by zhgzhg \ No newline at end of file diff --git a/AleksanderAleksandrov.php b/projectContributorsPersonalData/AleksanderAleksandrov.php similarity index 100% rename from AleksanderAleksandrov.php rename to projectContributorsPersonalData/AleksanderAleksandrov.php diff --git a/ElenaChavdarova.php b/projectContributorsPersonalData/ElenaChavdarova.php similarity index 100% rename from ElenaChavdarova.php rename to projectContributorsPersonalData/ElenaChavdarova.php diff --git a/ElitsaNedyalkova.php b/projectContributorsPersonalData/ElitsaNedyalkova.php similarity index 100% rename from ElitsaNedyalkova.php rename to projectContributorsPersonalData/ElitsaNedyalkova.php diff --git a/GyunerZeki.php b/projectContributorsPersonalData/GyunerZeki.php similarity index 100% rename from GyunerZeki.php rename to projectContributorsPersonalData/GyunerZeki.php diff --git a/KrasimirTsvetanov.php b/projectContributorsPersonalData/KrasimirTsvetanov.php similarity index 100% rename from KrasimirTsvetanov.php rename to projectContributorsPersonalData/KrasimirTsvetanov.php diff --git a/MargaritaKrushkova.php b/projectContributorsPersonalData/MargaritaKrushkova.php similarity index 100% rename from MargaritaKrushkova.php rename to projectContributorsPersonalData/MargaritaKrushkova.php diff --git a/MihailKopuschu.php b/projectContributorsPersonalData/MihailKopuschu.php similarity index 100% rename from MihailKopuschu.php rename to projectContributorsPersonalData/MihailKopuschu.php diff --git a/Nikoleta HW.php b/projectContributorsPersonalData/Nikoleta HW.php similarity index 100% rename from Nikoleta HW.php rename to projectContributorsPersonalData/Nikoleta HW.php diff --git a/PetyaStavarova.php b/projectContributorsPersonalData/PetyaStavarova.php similarity index 100% rename from PetyaStavarova.php rename to projectContributorsPersonalData/PetyaStavarova.php diff --git a/StoyanCheresharov.php b/projectContributorsPersonalData/StoyanCheresharov.php similarity index 100% rename from StoyanCheresharov.php rename to projectContributorsPersonalData/StoyanCheresharov.php diff --git a/Todor.php b/projectContributorsPersonalData/Todor.php similarity index 100% rename from Todor.php rename to projectContributorsPersonalData/Todor.php diff --git a/VanyaDimitrova.php b/projectContributorsPersonalData/VanyaDimitrova.php similarity index 100% rename from VanyaDimitrova.php rename to projectContributorsPersonalData/VanyaDimitrova.php diff --git a/VasilVasilev.php b/projectContributorsPersonalData/VasilVasilev.php similarity index 100% rename from VasilVasilev.php rename to projectContributorsPersonalData/VasilVasilev.php diff --git a/VictorAtanassov.php b/projectContributorsPersonalData/VictorAtanassov.php similarity index 100% rename from VictorAtanassov.php rename to projectContributorsPersonalData/VictorAtanassov.php diff --git a/ZhelyanGuglev.php b/projectContributorsPersonalData/ZhelyanGuglev.php similarity index 100% rename from ZhelyanGuglev.php rename to projectContributorsPersonalData/ZhelyanGuglev.php diff --git a/ivelina.php b/projectContributorsPersonalData/ivelina.php similarity index 100% rename from ivelina.php rename to projectContributorsPersonalData/ivelina.php diff --git a/martin_manov.php b/projectContributorsPersonalData/martin_manov.php similarity index 100% rename from martin_manov.php rename to projectContributorsPersonalData/martin_manov.php diff --git a/paolashumanova.php b/projectContributorsPersonalData/paolashumanova.php similarity index 100% rename from paolashumanova.php rename to projectContributorsPersonalData/paolashumanova.php diff --git a/public/.gitignore b/public/.gitignore new file mode 100644 index 00000000..79eb93b0 --- /dev/null +++ b/public/.gitignore @@ -0,0 +1 @@ +.htaccess \ No newline at end of file diff --git a/public/.htaccess b/public/.htaccess index 4a179d20..0dcd1cfd 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -2,6 +2,10 @@ RewriteEngine On RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d +<<<<<<< HEAD RewriteBase /zend2fmi +======= +RewriteBase /fmi +>>>>>>> e6069389b80e7d3f1e0b75bd0fd59d987ac36951 RewriteRule ^.*$ - [NC,L] RewriteRule ^.*$ index.php [NC,L] diff --git a/typography.css b/typography.css index aa6f9df5..bd09d875 100644 --- a/typography.css +++ b/typography.css @@ -1,8 +1,8 @@ @font-face { - font-family: "Trebuchet MS"; - src: url("../fonts/trebuc.ttf"); + font-family: "Trebuchet MS"; + src: url("../fonts/trebuc.ttf"); } body { - font: normal normal normal 9pt/105% "Trebuchet MS", Arial, Helvetica, sans-serif; /*"Trebuchet MS",*/ -} + font: normal normal normal 9pt/105% "Trebuchet MS", Arial, Helvetica, sans-serif; /*"Trebuchet MS",*/ +} \ No newline at end of file