Merge pull request RosDostup#9 from RosDostup/reformator-twitter

привязка конфигурации реформатора и виджета твиттера к переменной
Ahaenor · Sep 24, 2012 · dad9869 · dad9869
2 parents c119210 + 318ca62
commit dad9869
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/protected/config/appConfig.php b/protected/config/appConfig.php
@@ -73,10 +73,16 @@
 			);	
 
 $params=array(
+		//Information to connect reformal account
+		'reformal_prj_id' => '71829',
+		'reformal_prj_host' => 'rosdostup.reformal.ru',
+		//Search word for Twitter search plugin
+		'twtr_srchword'=>'rosdostup',
 		// Path to Logo image
 		'logo_path'=>'/images/prj_specific/rosdostup/logout.png',
 		// this is used in contact page
 		'adminEmail'=>'[email protected]',
+		//Yandex map's key
 		'YMapKey'=>'AKtzDVABAAAAbnnpfAIAZPFgkjAuQV52QNsahNkE7plr4F0AAAAAAAAAAAAyrGSHDyaYbEfL1i8AVZDhjT4VHQ==',
         'gibddOn' => false, // True, если ГИБДД участвует в форме дефекта; false, если она исключается из формы
 		//'layout'=>'startpage',

diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="language" content="ru" />
-<meta name="copyright" content="rosyama" />
+<meta name="copyright" content="rosdostup" />
 <meta name="robots" content="index, follow" />
 <title><?php echo CHtml::encode($this->pageTitle); ?></title>
 <link rel="icon" href="/favicon.ico" type="image/x-icon" />
@@ -56,10 +56,10 @@
 			var startSearchWidth=$('.search').width();
 			var startSearchInputWidth=$('.search .textInput').width();
 			var time=200;
-			
+
 							var searchWidth=230;
 				var	searchInputWidth=searchWidth-30;
-				
+
 										searchInputWidth-=47;
 				searchWidth-=47;
 							if ($.browser.msie && $.browser.version == 9) {
@@ -75,7 +75,7 @@
 					$('.search .textInput').animate({width:searchInputWidth},time);
 				})
 				$('.search .textInput').blur(function(){
-					
+
 					if ($(this).val()=='')
 					{
 						$(this).val('Поиск по адресу').addClass('inactive');
@@ -101,43 +101,37 @@
 						{
 							width: 150px !important;
 						}
-						
+
 					</style>
-					
+
 			</div>
 		</div>
-	</div>	
+	</div>
 		<?php echo $content; ?>
 
 	<div class="footer">
 
 		<div class="container">
 		<div class="left_footer">
-			&copy; <a href="http://navalny.ru/" target="_blank">Алексей Навальный</a>, 2011-2012
-			<br /><a href="mailto:[email protected]">[email protected]</a>
-			<br />
-			<br/>Разработано в <a href="http://pixelsmedia.ru" target="_blank">Pixelsmedia</a>
 			<br/>Powered by <a href="http://www.yiiframework.com/" target="_blank">Yii Framework</a>
 		</div>
 		<div class="center_footer">
 			<?php if($this->beginCache('countHoles', array('duration'=>3600))) { ?>
-			<?php $this->widget('application.widgets.collection.collectionWidget'); ?>			
+			<?php $this->widget('application.widgets.collection.collectionWidget'); ?>
 			<?php $this->endCache(); } ?>
-
-			<p class="friends">Чиним ямы в <i class="flag-UA"></i> <a href="http://ukryama.com/">Украине</a>, <i class="flag-BY"></i> <a href="http://belyama.by/">Беларуси</a> и <i class="flag-KZ"></i> <a href="http://kazyama.kz/">Казахстане</a></p>
 		</div>
 		<div class="right_footer">
-			<p class="autochmo"><a target="_blank" href="http://autochmo.ru/" title="Доска позора водителей &aring;вточмо">&aring;utochmo</a><br>Доска позора водителей</p>
-			Разработка прототипа и дизайна - <a href="http://greensight.ru">Greensight</a>
 		</div>
 
 		</div>
 	</div>
-	
+
 	<script type="text/javascript">
                 var reformalOptions = {
-                        project_id: 43983,
-                        project_host: "rosyama.reformal.ru",
+			//project_id: 71829,
+                        project_id: Yii::app()->params['reformal_prj_id'],
+                        //project_host: "rosdostup.reformal.ru",
+                        project_host: Yii::app()->params['reformal_prj_host']
                         force_new_window: false,
                         tab_alignment: "left",
                         tab_top: "316",
@@ -151,43 +145,43 @@
                         document.getElementsByTagName('head')[0].appendChild(script);
                 })();
         </script>
-               	
-	
+
+
 	<script type="text/javascript">
 	  var _gaq = _gaq || [];
 	  _gaq.push(['_setAccount', 'UA-21943923-3']);
 	  _gaq.push(['_trackPageview']);
-	
+
 	  (function() {
 		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
 		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 	  })();
-	
+
 	</script>
 	<? if (!$this->user->isGuest && $flash=$this->user->getFlash('user')):?>
 		<div id="addDiv">
 			<div id="fon">
 			</div>
 			<div id="popupdiv">
-			<?php echo ($flash); ?>			
+			<?php echo ($flash); ?>
 				 <span class="filterBtn close">
 					<i class="text">Продолжить</i>
 				 </span>
 			</div>
 		</div>
-		
+
 		<script type="text/javascript">
-		$(document).ready(function(){				
+		$(document).ready(function(){
 			$('.close').click(function(){
 				$('#popupdiv').fadeOut(400);
 				$('#fon').fadeOut(600);
 				$('#addDiv').fadeOut(800);
 			})
 		})
-	
+
 		</script>
 	<?endif?>
-	
+
 	</body>
-	</html>
+	</html>
diff --git a/protected/widgets/social/views/left.php b/protected/widgets/social/views/left.php
@@ -12,7 +12,7 @@
 		new TWTR.Widget({
 		version: 2,
 		type: 'search',
-		search: 'rosyama',
+		search: '<?php echo Yii::app()->params['twtr_srchword'] ?>',
 		interval: 6000,
 		title: '',
 		subject: '',