Merge branch 'master' of https://git.1ka.si:/git/1ka

admin/survey/classes/class.SurveyDiagnostics.php

@@ -169,11 +169,11 @@ class SurveyDiagnostics
 		echo '<p class="bottom16">'.$lang['srv_diagnostika_testiranje_notea'].'<a href="index.php?anketa=' . $this->sid . '&a=testiranje&m=testnipodatki">'.$lang['srv_diagnostika_testiranje_noteb'].'</a>'.$lang['srv_diagnostika_testiranje_notec'].'</p>';
 
 		echo '<div class="button_holder">';
-		echo '<div class="input_box">';
+		echo '  <div class="input_box">';
-		echo '<span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
+		echo '      <span class="faicon link-chain link-right blue"></span>';
-		echo '<input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" readonly/>';
+		echo '      <input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" readonly/>';
-		echo '</div>';
+		echo '  </div>';
-		echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
+		echo '  <button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
 		echo '</div>';
 
 		//Nastavitve testnega vnosa - popup	

admin/survey/classes/mobile/class.MobileSurveyAdmin.php

@@ -277,7 +277,7 @@ class MobileSurveyAdmin{
 
         // Odjava na nov nacin preko frontend/api
         echo '          <div><form name="odjava" id="form_odjava" method="post" action="'.$site_url.'frontend/api/api.php?action=logout">';
-        echo '              <span class="as_link" onClick="$(\'#form_odjava\').submit();"><span class="faicon logout"></span>' . $lang['logout'] . '</span>';
+        echo '              <span class="as_link noline" onClick="$(\'#form_odjava\').submit();"><span class="faicon logout"></span>' . $lang['logout'] . '</span>';
         echo '          </form></div>';
 
         echo '      </div>';
@@ -748,11 +748,6 @@ class MobileSurveyAdmin{
                     'url'   => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=settings',
                     'active' => ($_GET['a'] == A_VABILA && ($_GET['m'] == '' || $_GET['m'] == 'settings') ? 'active' : '')
                 ),
-                array(
-                    'title' => $lang['srv_publication_url'], 
-                    'url'   => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=url',
-                    'active' => ($_GET['a'] == A_VABILA && $_GET['m'] == 'url' ? 'active' : '')
-                ),
                 array(
                     'title' => $lang['srv_inv_nav_invitations'], 
                     'url'   => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_INVITATIONS . '&m=settings',

resources/sass/admin_new/components/header/top_line.scss

@@ -200,73 +200,6 @@ header #top_line{
 
             .anketa_header_activate{
 
-                // Gumb za aktivacijo ankete
-                .switch_anketa {
-                    position: relative;
-                    display: block;
-                    
-                    width: 46px;
-                    height: 16px;
-                    
-                    .switch_anketa_content {
-                        position: absolute;
-                        cursor: pointer;
-                        top: 0;
-                        left: 0;
-                        right: 0;
-                        bottom: 0;
-                        padding-top: 1px;
-
-                        color: white;
-                        font-size: 12px;
-                        font-weight: 400;
-                        line-height: 12px;
-                        
-                        background-color: $blue;
-                        border-radius: 16px;
-                    }
-                    .switch_anketa_content:before {
-                        position: absolute;
-                        content: "";
-                        
-                        height: 14px;
-                        width: 14px;
-                        bottom: 1px;
-                        
-                        background-color: white;
-                        border-radius: 50%;
-                    }
-                }
-
-                .switch_anketa.anketa_on{
-                    .switch_anketa_content{
-                        padding-left: 20px;
-                        background-color: $blue;
-                    }
-                    .switch_anketa_content:before{
-                        left: 1px;
-                    }
-                    &:hover{
-                        .switch_anketa_content{
-                            background-color: $dark-blue;
-                        }
-                    }
-                }
-
-                .switch_anketa.anketa_off{
-                    .switch_anketa_content{
-                        padding-left: 6px;
-                        background-color: $dark-gray;
-                    }
-                    .switch_anketa_content:before{
-                        right: 1px;
-                    }
-                    &:hover{
-                        .switch_anketa_content{
-                            background-color: darken($dark-gray, 5%);
-                        }
-                    }
-                }
             }
 
             .anketa_header_lock{
@@ -390,3 +323,71 @@ header #top_line{
         
     }
 }
+
+// Gumb za aktivacijo ankete
+.switch_anketa {
+    position: relative;
+    display: block;
+    
+    width: 46px;
+    height: 16px;
+    
+    .switch_anketa_content {
+        position: absolute;
+        cursor: pointer;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        padding-top: 1px;
+
+        color: white;
+        font-size: 12px;
+        font-weight: 400;
+        line-height: 12px;
+        
+        background-color: $blue;
+        border-radius: 16px;
+    }
+    .switch_anketa_content:before {
+        position: absolute;
+        content: "";
+        
+        height: 14px;
+        width: 14px;
+        bottom: 1px;
+        
+        background-color: white;
+        border-radius: 50%;
+    }
+}
+
+.switch_anketa.anketa_on{
+    .switch_anketa_content{
+        padding-left: 20px;
+        background-color: $blue;
+    }
+    .switch_anketa_content:before{
+        left: 1px;
+    }
+    &:hover{
+        .switch_anketa_content{
+            background-color: $dark-blue;
+        }
+    }
+}
+
+.switch_anketa.anketa_off{
+    .switch_anketa_content{
+        padding-left: 6px;
+        background-color: $dark-gray;
+    }
+    .switch_anketa_content:before{
+        right: 1px;
+    }
+    &:hover{
+        .switch_anketa_content{
+            background-color: darken($dark-gray, 5%);
+        }
+    }
+}

resources/sass/admin_new/mobile/basic.scss

@@ -42,6 +42,8 @@ fieldset {
     margin-left: 0 !important;
     margin-right: 0 !important;
 
+    padding: 12px 16px 16px;
+
     .nastavitveSpan1,
     .nastavitveSpan2,
     .nastavitveSpan3,

resources/sass/admin_new/mobile/header.scss

@@ -75,7 +75,7 @@ header{
             width: calc(100% - 120px);
     
             text-align: center;
-            font-size: 14px;
+            font-size: 17px;
             font-weight: 500;
         }
         .mobile_logo{
@@ -142,7 +142,7 @@ header{
     
                     padding: 18px 20px;
     
-                    font-size: 14px;
+                    font-size: 15px;
                     font-weight: 500;
                     text-decoration: none;
                     
@@ -209,7 +209,7 @@ header{
     
             > a {
                 display: block;
-                font-size: 14px;
+                font-size: 15px;
                 font-weight: 500;
                 padding: 18px 20px;
                 padding-left: 20px;
@@ -241,7 +241,7 @@ header{
                 }
         
                 a{
-                    font-size: 13px;
+                    font-size: 15px;
                     color: $main_text;
                         
                     .email{
@@ -258,9 +258,15 @@ header{
     
                 > div{
                     padding: 5px 0 10px 0;
-                    font-size: 14px;
+                    font-size: 15px;
                     font-weight: 500;
     
+                    form span,
+                    a{
+                        font-size: 15px;
+                        text-decoration: none;
+                    }
+
                     .faicon{
                         padding-right: 10px;
                         vertical-align: -1px;
@@ -302,7 +308,8 @@ header{
     
                 padding: 0 0 15px 0;
         
-                font-size: 13px;
+                font-size: 15px;
+                text-decoration: none;
     
                 &.anketa_img_nav{
                     padding-bottom: 20px;

resources/sass/admin_new/mobile/pages/publish.scss

@@ -1,4 +1,125 @@
 
+.page_vabila.subpage_settings #vabila{
+
+    .button_holder{
+        flex-wrap: wrap;
+
+        .input_box{
+            display: flex;
+            width: auto !important;
+        }
+
+        button{
+            margin: 0 0 0 8px;
+
+            &#nice_url_button{
+                margin: 16px 0 0 0;
+            }
+        }
+
+    }
+
+    .more_block{
+        width: 100%;
+    }
+}
+
+
+.page_invitations{
+
+    #inv_top_navi{
+        flex-direction: column;
+        align-items: flex-start;
+
+        margin-bottom: 32px;
+        
+        .inv_nav_settings{
+            flex-direction: column;
+
+            .inv_step{
+                text-align: right;
+            }
+        }
+
+        .inv_step{
+            margin-bottom: 4px;
+        }
+    }
+
+    .invitations_holder{
+        
+        &.fullwidth{
+            padding-left: 0 !important;
+            padding-right: 0 !important;
+        }
+
+        &.half-half{
+            flex-direction: column;
+
+            .left_holder,
+            .right_holder{
+                width: 100%;
+
+                margin-left: 0;
+                margin-right: 0;
+            }
+        }
+
+        &.left-menu{
+            flex-direction: column;
+        }
+
+        &.three-part{
+            flex-direction: column;
+
+            fieldset{
+                width: 100% !important;
+                min-width: 100% !important;
+            }
+        }
+
+        #inv_recipients_profiles_holder,
+        #inv_messages_profiles_holder{
+            min-height: auto !important;
+        }
+        
+        .setting_line.inv_sample{
+            word-break: break-all;
+        }
+
+        #inv_field_container ul li{
+            width: 100%;
+        }
+    }
+
+    .setting_holder.half-half{
+        flex-direction: column;
+
+        .setting_item{
+            width: 100%;
+            margin: 0 0 8px 0 !important;
+        }
+    }
+
+    #inv_msg_preview .setting_row{
+        flex-direction: column;
+
+        .setting_item{
+            width: 100%;
+            margin: 0 0 8px 0 !important;
+        }
+    }
+
+    .button_holder{
+        flex-wrap: wrap;
+
+        button{
+            margin-bottom: 8px;
+        }
+    }
+}
+
+
 #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,

resources/sass/admin_new/mobile/popup.scss

@@ -15,9 +15,14 @@
 
 // Klasicen popup
 .divPopUp{
-    width: 100%;
+    width: calc(100% - 32px) !important;
-    max-width: 100%;
+    max-width: calc(100% - 32px) !important;
 
     box-sizing: border-box;
     margin: 0 16px;
+
+    &.PopUpNarrow{
+        width: calc(100% - 32px) !important;
+        max-width: calc(100% - 32px) !important;
+    }
 }

resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss

@@ -72,10 +72,13 @@ div#srv_diagnostic {
         
     }
     div.input_box {
-        border: 1px solid $dark-gray;
+        display: flex;
+
         width: 300px;
         padding: 10px 0 10px 8px;
         
+        border: 1px solid $dark-gray;
+
         input {
             border: none;
             margin: 0;