diff --git a/admin/survey/classes/class.SurveySkupine.php b/admin/survey/classes/class.SurveySkupine.php index 9ecfd4736..45911a559 100644 --- a/admin/survey/classes/class.SurveySkupine.php +++ b/admin/survey/classes/class.SurveySkupine.php @@ -66,35 +66,53 @@ class SurveySkupine { echo '
'.$lang['srv_skupine'].''; echo '
'; - echo '
'.$lang['srv_skupine_insert'].' '.Help::display('srv_skupine'); - - if($spr_id != 0){ - - // dodajanje skupin za anketo - $vrednosti = $this->getVrednosti($spr_id); - foreach($vrednosti as $vrednost){ - echo '

'; - - echo ''.$vrednost['naslov'].''; - - $link = $vrednost['url']; - if(isset($vrednost['nice_url'])) - $link = $vrednost['nice_url']; - echo ' ('.$link.')'; - - echo ''; - - echo '

'; - } - } + echo '
'; + echo ''.$lang['srv_skupine_insert'].' '.Help::display('srv_skupine').''; + echo '
'; - // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - ce ni ni gumba za dodajanje skupin + // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - ce ni, ni gumba za dodajanje skupin if(!$userAccess->checkUserAccess($what='skupine')){ - echo '
'; $userAccess->displayNoAccess($what='skupine'); } else{ - echo '

'; + echo '
'; + echo ''; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + } + + if($spr_id != 0){ + + // izpis skupin za anketo + $vrednosti = $this->getVrednosti($spr_id); + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + foreach($vrednosti as $vrednost){ + + echo ''; + echo ''; + echo ''; + + $link = $vrednost['url']; + if(isset($vrednost['nice_url'])) + $link = $vrednost['nice_url']; + echo ''; + + echo ''; + + echo ''; + } + echo '
'.$lang['group_name'].''.$lang['group_URL'].''.$lang['group_answernumber'].'
'.$vrednost['naslov'].''.$link.'300
'; } echo '
'; diff --git a/admin/survey/redesign_test.php b/admin/survey/redesign_test.php index 6fbb2d7c9..2cc9bfa48 100644 --- a/admin/survey/redesign_test.php +++ b/admin/survey/redesign_test.php @@ -264,6 +264,26 @@

To je opozorilo, ki je celo rdeče.

Opozorilo: Tole je opozorilo, ki ni celo rdeče.

+ +

Tole je tabela

+ + + + + + + + + + + + + + + + +
Tekst - levoOstalo - centerŠtevilka - desno
Besedilo 1Nekaj1200
Besedilo 2Nekaj2
+
diff --git a/lang/1.php b/lang/1.php index c2413a19b..43363920e 100644 --- a/lang/1.php +++ b/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", diff --git a/lang/2.php b/lang/2.php index 89e3de81b..24361a278 100644 --- a/lang/2.php +++ b/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", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 27b76a84c..8317ea392 100644 --- a/public/css/admin_new.css +++ b/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 */ diff --git a/resources/sass/admin_new/basic/icons.scss b/resources/sass/admin_new/basic/icons.scss index e17ba1989..1a18eee19 100644 --- a/resources/sass/admin_new/basic/icons.scss +++ b/resources/sass/admin_new/basic/icons.scss @@ -4,11 +4,15 @@ a.faicon{ color: inherit; display: inline-block; font-weight: 900; - + &.link-right { 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"; @@ -47,4 +51,12 @@ span.faicon.bell::before{ span.faicon.bell_slash::before{ content: "\f1f6"; +} + +span.faicon.trash::before{ + content: "\f2ed"; +} + +span.faicon.copy::before{ + content: "\f0c5"; } \ No newline at end of file diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss index 600b4fae9..f9327473c 100644 --- a/resources/sass/admin_new/components/form/button.scss +++ b/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 { diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index e69de29bb..012a49ae8 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/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; + } + } + } +} \ No newline at end of file