[Redizajn 1KA] - Urejanje --> Nastavitve --> Skupine - v1

admin/survey/classes/class.SurveySkupine.php

@@ -66,35 +66,53 @@ class SurveySkupine {
 		echo '<fieldset><legend>'.$lang['srv_skupine'].'</legend>';
 		echo '<div id="skupine">';
 		
-		echo '<br />'.$lang['srv_skupine_insert'].' '.Help::display('srv_skupine');
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_skupine_insert'].' '.Help::display('srv_skupine').'</span>';
+		echo '</div>';
+        
+        // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - ce ni, ni gumba za dodajanje skupin
+        if(!$userAccess->checkUserAccess($what='skupine')){
+            $userAccess->displayNoAccess($what='skupine');
+        }
+        else{
+			echo '<div class="setting_holder">';
+			echo '<label for="skupina">'.$lang['group_name'].':</label>';
+			echo '<form>';
+			echo '<input type="text" id="skupina" name="skupina" class="large" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" />';
+			echo '<button class="medium blue mleft" onclick="add_skupina(\'1\');">'.$lang['add'].'</button>';
+			echo '</form>';
+			echo '</div>';
+        }
 
 		if($spr_id != 0){
 
-			// dodajanje skupin za anketo
+			// izpis skupin za anketo
 			$vrednosti = $this->getVrednosti($spr_id);
-			foreach($vrednosti as $vrednost){
+			echo '<table>';
-				echo '<p>';
 
-				echo '<strong>'.$vrednost['naslov'].'</strong>';
+			echo '<tr>';
+			echo '<th></th>';
+			echo '<th>'.$lang['group_name'].'</th>';
+			echo '<th>'.$lang['group_URL'].'</th>';
+			echo '<th>'.$lang['group_answernumber'].'</th>';
+			echo '</tr>';
+
+			foreach($vrednosti as $vrednost){
+				
+			echo '<tr>';
+			echo '<td><a><span class="faicon trash" onclick="delete_skupina(\'1\', \''.$vrednost['id'].'\');"></span></a></td>';
+			echo '<td>'.$vrednost['naslov'].'</td>';
 
 			$link = $vrednost['url'];
 				if(isset($vrednost['nice_url']))
 					$link = $vrednost['nice_url'];
-				echo ' (<a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a>)';
+			echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
 			
-				echo '<span class="faicon delete_circle icon-orange_link spaceLeft" style="margin-bottom:1px;" onclick="delete_skupina(\'1\', \''.$vrednost['id'].'\');"></span>';
+			echo '<td class="right">300</td>';
 
-				echo '</p>';
+			echo '</tr>';
 			}
-        }
+			echo '</table>';
-        
-        // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - ce ni ni gumba za dodajanje skupin
-        if(!$userAccess->checkUserAccess($what='skupine')){
-            echo '<br />';
-            $userAccess->displayNoAccess($what='skupine');
-        }
-        else{
-            echo '<p class="add_skupina_button"><input type="text" name="skupina" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" /> <input type="button" value="'.$lang['add'].'" onclick="add_skupina(\'1\');" /></p>';
         }
 		
 		echo '</div>';

admin/survey/redesign_test.php

@@ -265,6 +265,26 @@
                                 <p><span class="warning">Opozorilo:</span> Tole je opozorilo, ki ni celo rdeče.<p>
 
 
+                                <p>Tole je tabela</p>
+                                <table>
+                                    <tr>
+                                        <th>Tekst - levo</th>
+                                        <th class="center">Ostalo - center</th>
+                                        <th>Številka - desno</th>
+                                    </tr>
+                                    <tr>
+                                        <td>Besedilo 1</td>
+                                        <td class="center">Nekaj</td>
+                                        <td class="right">1200</td>
+                                    </tr>
+                                    <tr>
+                                        <td>Besedilo 2</td>
+                                        <td class="center">Nekaj</td>
+                                        <td class="right">2</td>
+                                    </tr>
+                                </table>
+
+                                
                                 
                             </fieldset>
 

lang/1.php

@@ -1143,6 +1143,8 @@ $lang = array (
 	"group_members"			=>	"Članov",
 	"group_new"			=>	"Nova skupina",
 	"group_name"			=>	"Ime skupine",
+	"group_URL"				=>	"URL Povezava",
+	"group_answernumber"	=>	"Število odgovorov",
 	"admin_edit_groups"		=>	"Urejanje skupin za",
 	"admin_edit_groups_no"		=>	"Ni skupin. Dodajte jih.",
 	"mass_select_group"		=>	"Izberite skupino(e) uporabnikov",

lang/2.php

@@ -1126,6 +1126,8 @@ $lang = array (
 	"group_members"		=>	"Members",
 	"group_new"		=>	"New group",
 	"group_name"		=>	"Group name",
+	"group_URL"				=> "URL Address",
+	"group_answernumber"	=>	"Number of answers",
 	"admin_edit_groups"	=>	"Editing groups for",
 	"admin_edit_groups_no"	=>	"There are no groups. You should add some",
 	"mass_select_group"	=>	"Select group(s) of users",

public/css/admin_new.css

@@ -5106,6 +5106,10 @@ span.faicon.link-right,
 a.faicon.link-right {
   margin-right: 10px;
 }
+span.faicon.link-left,
+a.faicon.link-left {
+  margin-left: 8px;
+}
 span.faicon.large,
 a.faicon.large {
   font-size: 32px !important;
@@ -5143,6 +5147,14 @@ span.faicon.bell_slash::before {
   content: "\f1f6";
 }
 
+span.faicon.trash::before {
+  content: "\f2ed";
+}
+
+span.faicon.copy::before {
+  content: "\f0c5";
+}
+
 a {
   cursor: pointer;
   color: #1E88E5;
@@ -5326,6 +5338,11 @@ button.red:hover,
 submit.red:hover {
   background-color: #e60000;
 }
+button.mleft,
+submit.mleft {
+  margin-left: 16px;
+  margin-bottom: 32px;
+}
 
 div.button_holder {
   display: flex;
@@ -5542,6 +5559,33 @@ textarea:focus {
   border-color: #1E88E5;
 }
 
+table {
+  margin: 8px 0;
+  border-collapse: collapse;
+  text-align: left;
+}
+table td, table th {
+  padding: 0 16px;
+  border-top: 1px solid #E5E5E5;
+  vertical-align: middle;
+}
+table th {
+  font-weight: 600;
+  background-color: #F8F8F8;
+}
+table td.center {
+  text-align: center;
+}
+table td.right {
+  text-align: right;
+}
+table tr {
+  height: 40px;
+}
+table tr:last-of-type td, table tr:last-of-type th {
+  border-bottom: 1px solid #E5E5E5;
+}
+
 /* 
     Specific pages scss
 */

resources/sass/admin_new/basic/icons.scss

@@ -9,6 +9,10 @@ a.faicon{
             margin-right: 10px;    
         }
 
+        &.link-left {
+            margin-left: 8px;    
+        }
+        
         //VELIKOSTI
 
         &.large {
@@ -32,7 +36,7 @@ a.faicon{
         &.yellow {
             color: $yellow;
         }
-}
+    }
 
 span.faicon.lock_open::before{
     content: "\f3c1";
@@ -48,3 +52,11 @@ span.faicon.bell::before{
 span.faicon.bell_slash::before{
     content: "\f1f6";
 }
+
+span.faicon.trash::before{
+    content: "\f2ed";
+}
+
+span.faicon.copy::before{
+    content: "\f0c5";
+}

resources/sass/admin_new/components/form/button.scss

@@ -92,6 +92,11 @@ submit{
             background-color: darken($red, 5%);
         }
     }
+
+    &.mleft {
+        margin-left: 16px;
+        margin-bottom: 32px;
+    }
 }
 
 div.button_holder {

resources/sass/admin_new/components/table/table.scss

@@ -0,0 +1,40 @@
+table {
+
+    margin: 8px 0;
+    border-collapse: collapse;
+    text-align: left;
+
+    td, th {
+        padding: 0 16px;
+        border-top: 1px solid $gray;
+        vertical-align: middle;
+    }
+
+    th {
+        font-weight: $semi-bold;
+        background-color: $light-gray;
+    }
+
+    td {
+
+        &.center {
+            text-align: center;
+        }
+        &.right {
+            text-align: right;
+        }
+
+    }
+
+    tr {
+        
+        height: 40px;
+
+        &:last-of-type{
+
+            td, th {   
+                border-bottom: 1px solid $gray;
+            }
+        }
+    }
+}