[Isocial-svn] SF.net SVN: isocial: [45]
Status: Pre-Alpha
Brought to you by:
aguidrevitch
From: <agu...@us...> - 2008-03-09 12:04:48
|
Revision: 45 http://isocial.svn.sourceforge.net/isocial/?rev=45&view=rev Author: aguidrevitch Date: 2008-03-09 05:04:52 -0700 (Sun, 09 Mar 2008) Log Message: ----------- minor updates Modified Paths: -------------- app/helpers/city_helper.php app/locales/user/ru.php app/views/default/index.tpl app/views/layouts/application.tpl app/views/message/send_successfully.tpl app/views/profile/groups.tpl app/views/profile/picture.tpl app/views/user/confirm.tpl app/views/user/forgot_password.tpl app/views/user/home.tpl app/views/user/laststep.tpl app/views/user/reset_password.tpl app/views/user/thankyou.tpl public/stylesheets/Application.css public/stylesheets/autocomplete.css Modified: app/helpers/city_helper.php =================================================================== --- app/helpers/city_helper.php 2008-03-07 13:55:11 UTC (rev 44) +++ app/helpers/city_helper.php 2008-03-09 12:04:52 UTC (rev 45) @@ -54,16 +54,14 @@ $tag_options = array_merge(array( 'name' => "city", 'id' => "auto_{$object}_{$method}", - 'onblur' => "if (!$('{$object}_{$method}').value || \$F(this.id) != \$F('{$object}_{$method}_prev')) { $(this.id).value = ''; $('{$object}_{$method}').value = null; $('{$object}_{$method}_prev').value = null; new Effect.Highlight(this.id, { startcolor: '#ff0000'})}", + 'onblur' => "city_updated(this, '{$object}_{$method}_prev', '{$object}_{$method}')", 'autocomplete' => 'on', ), $tag_options); $completion_options = array_merge(array( 'skip_style' => true, 'url' => array('action' => 'auto_complete_for_city'), - 'minChars' => 3, 'frequency' => 0.4, - 'callback' => "function (element, value) { $('{$object}_{$method}').value = null; return value} ", - 'afterUpdateElement' => "function (text, li) { $('{$object}_{$method}').value = li.id; $('{$object}_{$method}_prev').value = text.value; } " + 'afterUpdateElement' => "function (text, li) { $('{$object}_{$method}').value = li.id; $('{$object}_{$method}_prev').value = text.value; }" ), $completion_options); $hidden = $this->_controller->form_helper->hidden_field($object, $method); Modified: app/locales/user/ru.php =================================================================== --- app/locales/user/ru.php 2008-03-07 13:55:11 UTC (rev 44) +++ app/locales/user/ru.php 2008-03-09 12:04:52 UTC (rev 45) @@ -44,8 +44,8 @@ $dictionary['Confirmation error'] = 'Ошибка подтверждения'; $dictionary['bad confirmation link'] = 'ссылка подтверждения содержит ошибки'; $dictionary['Password reset error'] = 'Ошибка сброса пароля'; -$dictionary['no user found with the given email'] = 'пользователь с указанным email не зарегистрирован'; -$dictionary['bad reset link'] = 'ссылка сброса пароля содержит ошибки'; +$dictionary['No user found with the given e-mail'] = 'пользователь с указанным email не зарегистрирован'; +$dictionary['Bad reset link'] = 'ссылка сброса пароля содержит ошибки'; $dictionary['Trouble Accessing Your Account'] = 'Проблема с доступом к Вашей учетной записи'; $dictionary['Forgot Password'] = 'Забыли пароль'; $dictionary['Enter your login email below'] = 'Введите свой email адрес ниже'; Modified: app/views/default/index.tpl =================================================================== --- app/views/default/index.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/default/index.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -1,3 +1,3 @@ -<p> +<p class="indent"> <a class="linkbutton" href="/user/register"><div>_{Sign Up}</div></a> </p> \ No newline at end of file Modified: app/views/layouts/application.tpl =================================================================== --- app/views/layouts/application.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/layouts/application.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -8,6 +8,7 @@ <link href="/stylesheets/<?= $controller->getControllerName() ?>.css" rel="stylesheet" type="text/css"> <script src="/javascripts/prototype.js" type="text/javascript"></script> <script src="/javascripts/scriptaculous.js" type="text/javascript"></script> +<script src="/javascripts/autocomplete.js" type="text/javascript"></script> </head> <body id="application"> <div id="main"> Modified: app/views/message/send_successfully.tpl =================================================================== --- app/views/message/send_successfully.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/message/send_successfully.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -1,3 +1,3 @@ <?= $controller->renderPartial("menu") ?> -<p>_{Message successfully sended}</p> \ No newline at end of file +<p class="indent">_{Message successfully sent}</p> \ No newline at end of file Modified: app/views/profile/groups.tpl =================================================================== --- app/views/profile/groups.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/profile/groups.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -2,4 +2,4 @@ <?= $controller->renderErrors() ?> -<p>Coming soon</p> \ No newline at end of file +<p class="indent">Coming soon</p> \ No newline at end of file Modified: app/views/profile/picture.tpl =================================================================== --- app/views/profile/picture.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/profile/picture.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -2,4 +2,4 @@ <?= $controller->renderErrors() ?> -<p>Coming soon</p> \ No newline at end of file +<p class="indent">Coming soon</p> \ No newline at end of file Modified: app/views/user/confirm.tpl =================================================================== --- app/views/user/confirm.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/user/confirm.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -4,6 +4,6 @@ if ($controller->getErrors()) { echo $controller->renderErrors(); } else { ?> - <p>_{Thank you for registration}</p><br> - <p><a href="/user/login">_{go to login}</a></p> + <p class="indent">_{Thank you for registration}</p><br> + <p class="indent"><a href="/user/login">_{go to login}</a></p> <? } ?> Modified: app/views/user/forgot_password.tpl =================================================================== --- app/views/user/forgot_password.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/user/forgot_password.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -2,7 +2,7 @@ <?= $controller->renderErrors() ?> -<p>_{Forgot Password}? _{Enter your login email below}. +<p class="indent">_{Forgot Password}? _{Enter your login email below}. _{We will send you an email with a link to reset your password}.</p> <form action="/user/forgot_password" method="post"> @@ -18,4 +18,4 @@ </div> </form> -<p>_{If you have a different problem accessing your account, please see our} <a href="/help">_{Login Problems Help Page}</a>.</p> \ No newline at end of file +<p class="indent">_{If you have a different problem accessing your account, please see our} <a href="/help">_{Login Problems Help Page}</a>.</p> \ No newline at end of file Modified: app/views/user/home.tpl =================================================================== --- app/views/user/home.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/user/home.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -1 +1 @@ -<p>_{Hello}, <?= $current_user->name ?></p> +<p class="indent">_{Hello}, <?= $current_user->name ?></p> Modified: app/views/user/laststep.tpl =================================================================== --- app/views/user/laststep.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/user/laststep.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -1,2 +1,2 @@ <div class="title">_{Last step}</div> -<p>_{Check please your email and click on confirmation link}.</p> +<p class="indent">_{Check please your email and click on confirmation link}.</p> Modified: app/views/user/reset_password.tpl =================================================================== --- app/views/user/reset_password.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/user/reset_password.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -2,7 +2,7 @@ <?= $controller->renderErrors(); ?> -<p>_{Please enter a new password}.</p> +<p class="indent">_{Please enter a new password}.</p> <form action="/user/reset_password" method="post"> <div class="editform"> <div class="formrow"> Modified: app/views/user/thankyou.tpl =================================================================== --- app/views/user/thankyou.tpl 2008-03-07 13:55:11 UTC (rev 44) +++ app/views/user/thankyou.tpl 2008-03-09 12:04:52 UTC (rev 45) @@ -1,2 +1,2 @@ <div class="title">_{Thank you for registration}</div> -<p>_{Registration complete}</p> +<p class="indent">_{Registration complete}</p> Modified: public/stylesheets/Application.css =================================================================== --- public/stylesheets/Application.css 2008-03-07 13:55:11 UTC (rev 44) +++ public/stylesheets/Application.css 2008-03-09 12:04:52 UTC (rev 45) @@ -193,8 +193,7 @@ padding: 0; } -#content p { - margin: 0px; +#pagecontent #content p.indent { padding: 30px; } Modified: public/stylesheets/autocomplete.css =================================================================== --- public/stylesheets/autocomplete.css 2008-03-07 13:55:11 UTC (rev 44) +++ public/stylesheets/autocomplete.css 2008-03-09 12:04:52 UTC (rev 45) @@ -1,8 +1,10 @@ span.indicator { - display: none; + display: none; + margin-left: 4px; } + span.indicator img { - vertical-align: middle + vertical-align: middle; } div.auto_complete { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |