shortSearch # 1

ค้นหาจาก link footer
Merge branch 'master' of https://github.com/jessadayim/findtheroom

Conflicts:
	src/FTR/WebBundle/Controller/DetailController.php

	modified:   app/config/routing.yml
	modified:   src/FTR/AdminBundle/Controller/Building_siteController.php
	new file:   src/FTR/AdminBundle/Controller/Building_typeController.php
	new file:   src/FTR/AdminBundle/Controller/Facility2siteController.php
	new file:   src/FTR/AdminBundle/Controller/FacilitylistController.php
	deleted:    src/FTR/AdminBundle/Controller/FacilitylistsController.php
	modified:   src/FTR/AdminBundle/Controller/Ftr_logController.php
	modified:   src/FTR/AdminBundle/Controller/Ftr_logdetailController.php
	new file:   src/FTR/AdminBundle/Controller/ImageController.php
	new file:   src/FTR/AdminBundle/Controller/Nearly2siteController.php
	new file:   src/FTR/AdminBundle/Controller/Nearly_locationController.php
	new file:   src/FTR/AdminBundle/Controller/Nearly_typeController.php
	modified:   src/FTR/AdminBundle/Controller/PanelController.php
	new file:   src/FTR/AdminBundle/Controller/Pay_typeController.php
	new file:   src/FTR/AdminBundle/Controller/Roomtype2siteController.php
	new file:   src/FTR/AdminBundle/Controller/RoomtypeController.php
	modified:   src/FTR/AdminBundle/Controller/User_adminController.php
	modified:   src/FTR/AdminBundle/Controller/UseradminlistsController.php
	modified:   src/FTR/AdminBundle/Controller/UserownerlistsController.php
	new file:   src/FTR/AdminBundle/Controller/ZoneController.php
	new file:   src/FTR/AdminBundle/Entity/Building_view_count.php
	modified:   src/FTR/AdminBundle/Form/Building_siteType.php
	new file:   src/FTR/AdminBundle/Form/Building_typeType.php
	new file:   src/FTR/AdminBundle/Form/Facility2siteType.php
	new file:   src/FTR/AdminBundle/Form/FacilitylistType.php
	new file:   src/FTR/AdminBundle/Form/ImageType.php
	new file:   src/FTR/AdminBundle/Form/Nearly2siteType.php
	new file:   src/FTR/AdminBundle/Form/Nearly_locationType.php
	new file:   src/FTR/AdminBundle/Form/Nearly_typeType.php
	new file:   src/FTR/AdminBundle/Form/Pay_typeType.php
	new file:   src/FTR/AdminBundle/Form/Roomtype2siteType.php
	new file:   src/FTR/AdminBundle/Form/RoomtypeType.php
	new file:   src/FTR/AdminBundle/Form/ZoneType.php
	new file:   src/FTR/AdminBundle/Repository/Building_view_countRepository.php
	modified:   src/FTR/AdminBundle/Resources/config/routing.yml
	modified:   src/FTR/AdminBundle/Resources/config/routing/building_site.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/building_type.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/facility2site.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/facilitylist.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/image.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/nearly2site.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/nearly_location.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/nearly_type.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/pay_type.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/roomtype.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/roomtype2site.yml
	new file:   src/FTR/AdminBundle/Resources/config/routing/zone.yml
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/edit.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/index.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/new.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Building_site/show.html.twig
	renamed:    src/FTR/AdminBundle/Resources/views/Building_site/edit.html.twig -> src/FTR/AdminBundle/Resources/views/Building_type/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Building_type/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Building_type/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Building_type/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Facility2site/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Facility2site/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Facility2site/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Facility2site/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Facilitylist/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Facilitylist/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Facilitylist/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Facilitylist/show.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Ftr_panel/buildingsitelists.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Ftr_panel/signin.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Ftr_panel/useradminlists.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Ftr_panel/userownerlists.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Image/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Image/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Image/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Image/show.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/Layout/panel_layout.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly2site/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly2site/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly2site/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly2site/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly_location/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly_location/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly_location/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly_location/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly_type/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly_type/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly_type/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Nearly_type/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Pay_type/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Pay_type/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Pay_type/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Pay_type/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Roomtype/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Roomtype/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Roomtype/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Roomtype/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Roomtype2site/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Roomtype2site/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Roomtype2site/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Roomtype2site/show.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/User_admin/index.html.twig
	modified:   src/FTR/AdminBundle/Resources/views/User_admin/show.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Zone/edit.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Zone/index.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Zone/new.html.twig
	new file:   src/FTR/AdminBundle/Resources/views/Zone/show.html.twig
	modified:   src/FTR/AdminBundle/Tests/Controller/Ftr_logControllerTest.php
	modified:   src/FTR/AdminBundle/Tests/Controller/Ftr_logdetailControllerTest.php
	modified:   src/FTR/AdminBundle/Tests/Controller/User_adminControllerTest.php
	modified:   src/FTR/WebBundle/Controller/ContactController.php
	modified:   src/FTR/WebBundle/Controller/DetailController.php
	modified:   src/FTR/WebBundle/Controller/ForgetController.php
	modified:   src/FTR/WebBundle/Controller/MainController.php
	modified:   src/FTR/WebBundle/Controller/RegisterController.php
	modified:   src/FTR/WebBundle/Controller/ResetController.php
	modified:   src/FTR/WebBundle/Controller/UserbuildingController.php
	modified:   src/FTR/WebBundle/Entity/Image.php
	modified:   src/FTR/WebBundle/Resources/config/routing.yml
	modified:   src/FTR/WebBundle/Resources/config/routing/userbuilding.yml
	modified:   src/FTR/WebBundle/Resources/views/Contact/contact.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Detail/detail.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Layout/Layout.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Main/index.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Search/search.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Security/login.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Security/resetpass.html.twig
	modified:   src/FTR/WebBundle/Resources/views/Userbuilding/add.html.twig
	deleted:    src/FTR/WebBundle/Resources/views/Userbuilding/choosefile.html.twig
	deleted:    src/FTR/WebBundle/Resources/views/Userbuilding/uploadfile.html.twig
	new file:   src/FTR/WebBundle/Tests/Controller/Building_typeControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/Facility2siteControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/FacilitylistControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/ImageControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/Nearly2siteControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/Nearly_locationControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/Nearly_typeControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/Pay_typeControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/Roomtype2siteControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/RoomtypeControllerTest.php
	new file:   src/FTR/WebBundle/Tests/Controller/ZoneControllerTest.php
	renamed:    web/captcha/bg.jpg -> web/bg.jpg
	new file:   web/captcha/Harabara.ttf
	modified:   web/captcha/bg.jpg
	new file:   web/captcha/captcha_img.jpg
	new file:   web/captcha/php/image_req.php
	modified:   web/captcha/test.jpg
	modified:   web/css/jquery.fancybox-1.3.4.css
	modified:   web/css/main.css
	new file:   web/css/paging/smartpaginator.buildingsite.css
	new file:   web/css/paging/sytletable.css
	modified:   web/css/panel/960_12.css
	modified:   web/css/panel/reset.css
	modified:   web/css/panel/style.css
	modified:   web/css/panel/vertical-menu.css
	new file:   web/images/back_home.png
	new file:   web/images/default.png
	new file:   web/images/exmap.png
	modified:   web/images/footer2.png
	new file:   web/images/paging/back_disabled.png
	new file:   web/images/paging/back_enabled.png
	new file:   web/images/paging/back_enabled_hover.png
	new file:   web/images/paging/forward_disabled.png
	new file:   web/images/paging/forward_enabled.png
	new file:   web/images/paging/forward_enabled_hover.png
	new file:   web/images/paging/sort_asc.png
	new file:   web/images/paging/sort_asc_disabled.png
	new file:   web/images/paging/sort_both.png
	new file:   web/images/paging/sort_desc.png
	new file:   web/images/paging/sort_desc_disabled.png
	modified:   web/js/fancybox/jquery.fancybox-1.3.4.pack.js
	new file:   web/js/gritter/README.markdown
	new file:   web/js/gritter/css/jquery.gritter.css
	new file:   web/js/gritter/images/gritter-light.png
	new file:   web/js/gritter/images/gritter-long.png
	new file:   web/js/gritter/images/gritter.png
	new file:   web/js/gritter/images/ie-spacer.gif
	new file:   web/js/gritter/images/trees.jpg
	new file:   web/js/gritter/index.html
	new file:   web/js/gritter/js/jquery.gritter.js
	new file:   web/js/gritter/js/jquery.gritter.min.js
	new file:   web/js/paging/jquery-1.4.2.js
	new file:   web/js/paging/jquery.dataTables.js
	new file:   web/js/paging/smartpaginator.buildingsite.js
	modified:   web/js/panel/chart/adapters/mootools-adapter.src.js
	modified:   web/js/panel/chart/adapters/prototype-adapter.src.js
	modified:   web/js/panel/chart/highcharts-more.js
	modified:   web/js/panel/chart/highcharts.js
	modified:   web/js/panel/chart/highcharts.src.js
	modified:   web/js/panel/chart/modules/canvas-tools.js
	modified:   web/js/panel/chart/modules/canvas-tools.src.js
	modified:   web/js/panel/chart/modules/exporting.js
	modified:   web/js/panel/chart/modules/exporting.src.js
	modified:   web/js/panel/chart/themes/dark-blue.js
	modified:   web/js/panel/chart/themes/dark-green.js
	modified:   web/js/panel/chart/themes/gray.js
	modified:   web/js/panel/chart/themes/grid.js
	modified:   web/js/panel/chart/themes/skies.js
	new file:   web/js/sisyphus-autosave/README.md
	new file:   web/js/sisyphus-autosave/SpecRunner.html
	new file:   web/js/sisyphus-autosave/sisyphus.js
	new file:   web/js/sisyphus-autosave/sisyphus.min.js
	new file:   web/js/sisyphus-autosave/spec/javascripts/fixtures/fixtures.html
	new file:   web/js/sisyphus-autosave/spec/spec.js
	new file:   web/js/sisyphus-autosave/vendor/jasmine/MIT.LICENSE
	new file:   web/js/sisyphus-autosave/vendor/jasmine/jasmine-html.js
	new file:   web/js/sisyphus-autosave/vendor/jasmine/jasmine-jquery.js
	new file:   web/js/sisyphus-autosave/vendor/jasmine/jasmine.css
	new file:   web/js/sisyphus-autosave/vendor/jasmine/jasmine.js
	new file:   web/js/sisyphus-autosave/vendor/jasmine/jasmine_favicon.png
	new file:   web/js/sisyphus-autosave/vendor/jquery-1.6.4.min.js
	modified:   web/js/uploadify.control.js
	modified:   web/js/uploadify/uploadify.php
	deleted:    web/testrand.php
	deleted:    web/uploadify.html