Мелкие фиксы

2f882b47 · Andrew Rudenets · f33e4b19 · 2f882b47 · 2f882b47 · 2f882b47
Commit 2f882b47 authored 10 years ago by Andrew Rudenets
--- a/~dev_rating/application/classes/Controller/Handler/AdmAccounts.php
+++ b/~dev_rating/application/classes/Controller/Handler/AdmAccounts.php
@@ -92,7 +92,7 @@ class Controller_Handler_AdmAccounts extends Controller_Handler {
        protected function _sendPDF($filename, $template, $data)
        {
            $mpdf = View_MPDF::factory($template, $data);
-            $cssPath = 'media/css/acTpl.css';
+            $cssPath = 'media/css/pdf/activationTemplate.css';
            $css = file_get_contents($cssPath);
            $mpdf->get_mpdf()->WriteHTML($css, 1);
            $this->response->headers('Set-Cookie',  'fileDownload=true; path=/');

--- a/~dev_rating/application/views/admin/base.twig
+++ b/~dev_rating/application/views/admin/base.twig
@@ -10,7 +10,7 @@
 {% endmacro %}

 {% macro action(URL, image, title, message, actionID = '') %}
-<a href="{{ URL }}">
+<a href="{{ URL }}" class="action_link">
    <div class="action">
        <div class="action_image">
            <img src="{{ image }}" />

--- a/~dev_rating/application/views/base.twig
+++ b/~dev_rating/application/views/base.twig
 <!DOCTYPE html>
 {% macro action(URL, image, title, message, actionID = '') %}
-<a href="{{ URL }}">
+<a href="{{ URL }}" class="action_link">
    <div class="action">
        <div class="action_image">
            <img src="{{ image }}" />

--- a/~dev_rating/application/views/teacher/index.twig
+++ b/~dev_rating/application/views/teacher/index.twig
@@ -35,12 +35,14 @@
                            {% endfor %}
                        </td>
                        <td class='common_cell'>
-                            {% set UKDcontent = "<div class='show_ukd_btn'>Оценивание</div>" %}
-                            {{ HTML.anchor('rating/'~Discipline.ID, UKDcontent, {'title': 'Выставление баллов по дисциплине'})|raw }}
+                            {{ HTML.anchor('rating/'~Discipline.ID, 
+                                    "<div>Оценивание</div>", 
+                                    {'title': 'Выставление баллов по дисциплине', 'class': 'disc_button'})|raw }}
                        </td>
                        <td class='common_cell'>
-                            {% set UKDcontent = "<div class='show_ukd_btn'>Редактирование</div>" %}
-                            {{ HTML.anchor('map/structure/'~Discipline.ID, UKDcontent, {'title': 'Просмотр и редактирование дисциплины'})|raw }}
+                            {{ HTML.anchor('map/structure/'~Discipline.ID, 
+                                    "<div>Редактирование</div>", 
+                                    {'title': 'Просмотр и редактирование дисциплины', 'class': 'disc_button'})|raw }}
                        </td>
                    </tr>
            {% if loop.last %}        

--- a/~dev_rating/media/css/actionButton.css
+++ b/~dev_rating/media/css/actionButton.css
@@ -4,6 +4,11 @@
    margin-top: 10px;
 }

+.action_link
+{
+    text-decoration: none;
+}
+
 .action
 {
    background-color: #ffffff;
@@ -12,6 +17,7 @@
    border-right: 0;
    margin: 2px 0;
    padding: 10px;
+    text-decoration: none;
 }

 .action:hover
@@ -24,12 +30,14 @@
 {
    display: inline-block;
    vertical-align: middle;
+    text-decoration: none;
 }

 .action_content
 {
    width: 90%;
    margin-left: 5px;
+    text-decoration: none;
 }

 .action_title
@@ -37,10 +45,12 @@
    font-size: 17pt;
    margin-bottom: 10px;
    color: #0183ce;
+    text-decoration: none;
 }

 .action_message
 {
    font-size: 9pt;
    color: #000;
+    text-decoration: none;
 }
--- a/~dev_rating/media/css/courses_teacher.css
+++ b/~dev_rating/media/css/courses_teacher.css
@@ -48,26 +48,29 @@

 /* ============ УКД ========================== */

-.show_ukd_btn {
-
-        text-decoration: none;
-	margin: 5px auto;
-	display: block;
-	border: 0;
-	padding: 6px 20px;
-        max-width: 60%;
-	background: #39973f; /*#3A84A6;*/
-	font-weight: bold;
-	font-size: 13px;
-	color: #ffffff;
-	border-radius: 3px; 
-	moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-khtml-border-radius: 3px;	
+.disc_button
+{
+    text-decoration: none;
+}
+
+.disc_button > div {
+    margin: 5px auto;
+    display: block;
+    border: 0;
+    padding: 6px 20px;
+    max-width: 60%;
+    background: #39973f; /*#3A84A6;*/
+    font-weight: bold;
+    font-size: 13px;
+    color: #ffffff;
+    border-radius: 3px; 
+    moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    -khtml-border-radius: 3px;	
 }


-.show_ukd_btn:hover {
+.disc_button > div:hover {
 	background: #3399CC;
 	cursor: pointer;
 }

--- a/~dev_rating/media/css/acTpl.css
+++ b/~dev_rating/media/css/acTpl.css
--- a/~dev_rating/media/js/sign.js
+++ b/~dev_rating/media/js/sign.js
@@ -54,7 +54,7 @@ $(function()
        });
    });
 	
-	$(document).keypress(function(){
+	$(document).keypress(function(event){
 		if(event.keyCode==13)
 		   {
 			  $('#signin_b').trigger('click');