diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..412eeda7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..5ebd21a1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,163 @@ +################# +## 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 +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results +[Dd]ebug/ +[Rr]elease/ +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.vspscc +.builds +*.dotCover + +## TODO: If you have NuGet Package Restore enabled, uncomment this +#packages/ + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf + +# Visual Studio profiler +*.psess +*.vsp + +# ReSharper is a .NET coding add-in +_ReSharper* + +# Installshield output folder +[Ee]xpress + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish + +# Others +[Bb]in +[Oo]bj +sql +TestResults +*.Cache +ClientBin +stylecop.* +~$* +*.dbmdl +Generated_Code #added for RIA/Silverlight projects + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML + + + +############ +## Windows +############ + +# Windows image file caches +Thumbs.db + +# Folder config file +Desktop.ini + + +############# +## Python +############# + +*.py[co] + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg + +# Mac crap +.DS_Store diff --git a/AleksanderAleksandrov.php b/AleksanderAleksandrov.php new file mode 100644 index 00000000..c17817de --- /dev/null +++ b/AleksanderAleksandrov.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Aleksander Aleksandrov, emai: aleksaander_aleksandrov@abv.bg

'; ?> + + \ No newline at end of file diff --git a/ContributingStudent.php b/ContributingStudent.php new file mode 100644 index 00000000..e2786a66 --- /dev/null +++ b/ContributingStudent.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Contributing Student.

'; ?> + + \ No newline at end of file diff --git a/ElenaChavdarova.php b/ElenaChavdarova.php new file mode 100644 index 00000000..b5c29527 --- /dev/null +++ b/ElenaChavdarova.php @@ -0,0 +1,8 @@ + + + Hello, World + + + Hello World from Elena Chavdarova email: elenachavdarova91@gmail.com

'; ?> + + \ No newline at end of file diff --git a/ElitsaNedyalkova.php b/ElitsaNedyalkova.php new file mode 100644 index 00000000..76a86387 --- /dev/null +++ b/ElitsaNedyalkova.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Elitsa Nedyalkova elyned@abv.bg

'; ?> + + \ No newline at end of file diff --git a/GyunerZeki.php b/GyunerZeki.php new file mode 100644 index 00000000..a19d7246 --- /dev/null +++ b/GyunerZeki.php @@ -0,0 +1,9 @@ + + + PHP Test + + + Hello World Gyuner Zeki!

'; ?> + + + diff --git a/KrasimirTsvetanov.php b/KrasimirTsvetanov.php new file mode 100644 index 00000000..32b6fbbb --- /dev/null +++ b/KrasimirTsvetanov.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Krasimir Tsvetanov! kraseza@gmail.com

'; ?> + + \ No newline at end of file diff --git a/MargaritaKrushkova.php b/MargaritaKrushkova.php new file mode 100644 index 00000000..94a256c6 --- /dev/null +++ b/MargaritaKrushkova.php @@ -0,0 +1,8 @@ + + + PHP Test + + + I am Margarita Krushkova

'; ?> + + \ No newline at end of file diff --git a/MihailKopuschu.php b/MihailKopuschu.php new file mode 100644 index 00000000..435a694d --- /dev/null +++ b/MihailKopuschu.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Mihail Kopuschu! meshko1989@mail.ru

'; ?> + + \ No newline at end of file diff --git a/Nikoleta HW.php b/Nikoleta HW.php new file mode 100644 index 00000000..b904ebdd --- /dev/null +++ b/Nikoleta HW.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello! Nikoleta Poibrenska email: nikoleta.poibrenska@abv.bg

'; ?> + + \ No newline at end of file diff --git a/PetyaStavarova.php b/PetyaStavarova.php new file mode 100644 index 00000000..1e74060a --- /dev/null +++ b/PetyaStavarova.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Petya Stavarova, petyast92@gmail.com

'; ?> + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..de855a2f --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +This is a sample PHP project diff --git a/StoyanCheresharov.php b/StoyanCheresharov.php new file mode 100644 index 00000000..782a3047 --- /dev/null +++ b/StoyanCheresharov.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World Stoyan Cheresharov! cheresharov@hotmail.com

'; ?> + + \ No newline at end of file diff --git a/StudentContributor.php b/StudentContributor.php new file mode 100644 index 00000000..e3de1596 --- /dev/null +++ b/StudentContributor.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Stoyan Cheresharov. change. Other change

'; ?> + + \ No newline at end of file diff --git a/Todor.php b/Todor.php new file mode 100644 index 00000000..10333db1 --- /dev/null +++ b/Todor.php @@ -0,0 +1,10 @@ + + + PHP Test + + + Hello from Todor

'; ?> + Този проект може да бъде разгледан на адрес: fmi-project-todor.eu01.aws.af.cm + Публично резозитори(форк): git@github.com:asdator/fmi.git + + \ No newline at end of file diff --git a/VanyaDimitrova.php b/VanyaDimitrova.php new file mode 100644 index 00000000..92863aa5 --- /dev/null +++ b/VanyaDimitrova.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Vanya Dimitrova! wanya.dimitrowa@gmail.com

'; ?> + + \ No newline at end of file diff --git a/VasilVasilev.php b/VasilVasilev.php new file mode 100644 index 00000000..0723efb0 --- /dev/null +++ b/VasilVasilev.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Vasil Vasilev vasil.georgiev.34@gmail.com

'; ?> + + \ No newline at end of file diff --git a/ZhelyanGuglev.php b/ZhelyanGuglev.php new file mode 100644 index 00000000..2f73bf32 --- /dev/null +++ b/ZhelyanGuglev.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Zhelyan Guglev!!! E-mail: jelian_g@mail.bg

'; ?> + + diff --git a/index.html b/index.html new file mode 100644 index 00000000..581e9b10 --- /dev/null +++ b/index.html @@ -0,0 +1,67 @@ + + + + FMI + + + +
+
+ +
+
+
+

Content

+
+
+ +
+
+
+

Advertisements

+
+
+ +
+
+ + + \ No newline at end of file diff --git a/index.php b/index.php index d5a9ce2b..5004c279 100644 --- a/index.php +++ b/index.php @@ -3,6 +3,39 @@ Hello World +<<<<<<< HEAD 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 +>>>>>>> refs/remotes/fmi@github/master diff --git a/index1.php b/index1.php new file mode 100644 index 00000000..29dbc016 --- /dev/null +++ b/index1.php @@ -0,0 +1 @@ +gdfgdfgfd diff --git a/ivelina.php b/ivelina.php new file mode 100644 index 00000000..2f0700d0 --- /dev/null +++ b/ivelina.php @@ -0,0 +1,10 @@ + + + PHP Test + + + + + + + \ No newline at end of file diff --git a/layout.css b/layout.css new file mode 100644 index 00000000..be424f98 --- /dev/null +++ b/layout.css @@ -0,0 +1,77 @@ +@CHARSET "UTF-8"; + +body, html{ + margin: 0; + padding: 0; +} + +body { + text-align: center; + background: yellow; +} + +#wrap { + width: 960px; /* 80%;*/ + margin: auto; + text-align: left; +} + +#header { + position: relative; + top: 0; + left: 0; + width:100%; + height: 100px; + background: green; +} + +#footer { + clear: both; + width:100%; + height: 60px; + background: cyan; +} + +#mainBody { + float: left; + width: 80%; + background: red; +} + +#content { + float: right; + width: 80%; + min-height: 300px; + background: brown; +} + +#navSide { + float: left; + width: 20%; + /* display: none; */ +} + +#add { + float: right; + width: 20%; + /* display: none; */ + background: blue; +} + +#wrapInner { + width: 100%; + margin: auto; +} + +#navTop { + position: absolute; + left: 0; + bottom: 0; + width: 100%; + /* height: 30px; */ + text-align: center; +} + +.inside { + padding: 5px; +} \ No newline at end of file diff --git a/martin_manov.php b/martin_manov.php new file mode 100644 index 00000000..ae688f8e --- /dev/null +++ b/martin_manov.php @@ -0,0 +1,14 @@ + + + PHP Test + + + Martin Manov - matrixatp.martin@gmail.com

+ Здравейте, + имах малко проблеми с изпращането до GitHub. + Първо трябваше да отида до Git->Merge. След това Commit продължаваше да не работи, но успешно направих Push. + Дано това да може да помогне на останалите, ако има затруднения. + Поздрави + '; ?> + + \ No newline at end of file diff --git a/navcontainer.css b/navcontainer.css new file mode 100644 index 00000000..59c4e4fd --- /dev/null +++ b/navcontainer.css @@ -0,0 +1,122 @@ +/*In order to make it work in IE we need to load also */ +/* */ +#navcontainer { +/* background:url(../images/menu_bg.jpg); */ +} + +#navcontainer ul { + padding: 0; + margin: 0; + list-style: none; + 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; */ +} + +#navcontainer a:visited { +/* 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; +} + +/* Active Menus */ +ul li.active a{ +/* color:#000; */ +} + +ul li.active a:visited { +/* color:#000; */ +} + +ul li.active a:hover { +/* 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*/ +} + +#navcontainer li ul a:visited { +/* color:#000000; */ +} + +#navcontainer li ul a:hover { + 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; +} + +/* for the next level we move it to the right "indent" Controls how far right are the next menus +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*/ + margin: -0.8em 0 0 0; + } +#navcontainer li ul ul { + margin: -2.5em 0 0 8.5em; + } +#navcontainer li ul ul ul{ + margin: -2.5em 0 0 8.5em; + } + #navcontainer li ul ul ul ul{ + margin: -2.5em 0 0 8.5em; + } + #navcontainer li ul ul ul ul ul{ + margin: -2.5em 0 0 8.5em; + } + +/* We starting to hide them now this moves the lists very far left*/ + #navcontainer li ul { + position: absolute; + width: 10em; + 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 { + 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 { + left: auto; + z-index: 1000; +} + diff --git a/paolashumanova.php b/paolashumanova.php new file mode 100644 index 00000000..60b55c81 --- /dev/null +++ b/paolashumanova.php @@ -0,0 +1,8 @@ + + + PHP Test + + + Hello World from Paola Shumanova email: paolaaa7@abv.bg

'; ?> + + \ No newline at end of file diff --git a/standard_structure.css b/standard_structure.css new file mode 100644 index 00000000..9f6d8cb1 --- /dev/null +++ b/standard_structure.css @@ -0,0 +1,7 @@ +@import url("layout.css"); +@import url("navcontainer.css"); +@import url("typography.css"); +/* +@import url("custom.css"); +@import url("tables.css"); +*/ \ No newline at end of file diff --git a/standard_structure.js b/standard_structure.js new file mode 100644 index 00000000..3c8dbdac --- /dev/null +++ b/standard_structure.js @@ -0,0 +1,3 @@ +window.onload = function(e) { + alert('Hello World!'); +} \ No newline at end of file diff --git a/typography.css b/typography.css new file mode 100644 index 00000000..aa6f9df5 --- /dev/null +++ b/typography.css @@ -0,0 +1,8 @@ +@font-face { + font-family: "Trebuchet MS"; + src: url("../fonts/trebuc.ttf"); +} + +body { + font: normal normal normal 9pt/105% "Trebuchet MS", Arial, Helvetica, sans-serif; /*"Trebuchet MS",*/ +} diff --git a/webroot/gitTest b/webroot/gitTest new file mode 100644 index 00000000..58774332 --- /dev/null +++ b/webroot/gitTest @@ -0,0 +1,8 @@ + + + PHP Test + + + Testing GITHub push with read-only rights.

'; ?> + + \ No newline at end of file