Skip to content

Commit

Permalink
Next beta (let's call it 2.3.7) - part 3
Browse files Browse the repository at this point in the history
  • Loading branch information
Heklaterriol committed Feb 3, 2023
1 parent 18ffd67 commit 447f7c4
Show file tree
Hide file tree
Showing 51 changed files with 9,739 additions and 1,342 deletions.
4 changes: 0 additions & 4 deletions media/FontAwesome/css/font-awesome.min.css

This file was deleted.

5 changes: 5 additions & 0 deletions media/FontAwesome/css/fontawesome.min.css

Large diffs are not rendered by default.

Binary file added media/FontAwesome/webfonts/fa-brands-400.eot
Binary file not shown.
3,717 changes: 3,717 additions & 0 deletions media/FontAwesome/webfonts/fa-brands-400.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/FontAwesome/webfonts/fa-brands-400.ttf
Binary file not shown.
Binary file added media/FontAwesome/webfonts/fa-brands-400.woff
Binary file not shown.
Binary file added media/FontAwesome/webfonts/fa-brands-400.woff2
Binary file not shown.
Binary file added media/FontAwesome/webfonts/fa-regular-400.eot
Binary file not shown.
801 changes: 801 additions & 0 deletions media/FontAwesome/webfonts/fa-regular-400.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/FontAwesome/webfonts/fa-regular-400.ttf
Binary file not shown.
Binary file added media/FontAwesome/webfonts/fa-regular-400.woff
Binary file not shown.
Binary file added media/FontAwesome/webfonts/fa-regular-400.woff2
Binary file not shown.
Binary file added media/FontAwesome/webfonts/fa-solid-900.eot
Binary file not shown.
5,034 changes: 5,034 additions & 0 deletions media/FontAwesome/webfonts/fa-solid-900.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/FontAwesome/webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file added media/FontAwesome/webfonts/fa-solid-900.woff
Binary file not shown.
Binary file added media/FontAwesome/webfonts/fa-solid-900.woff2
Binary file not shown.
13 changes: 5 additions & 8 deletions media/css/calendar.css
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,15 @@ div#jem .eventtitle {

#jlcalendarlegend .eventCat {
float: left;
padding: 1px 5px;

cursor: pointer;
box-shadow: 2px 2px 2px #888888;
/* padding: 1px 5px;
border: 1px solid black;
margin-left:4px;
margin-right:4px;
margin-bottom:6px;
line-height:20px;
line-height:20px; */
}

#jlcalendarlegend .legendb {
Expand All @@ -248,10 +249,6 @@ div#jem .eventtitle {
div#buttonshowall,
div#buttonhideall {
float: left;
padding-top:3px;
padding-left:4px;
padding-right:4px;
margin-right: 6px;
cursor: pointer;
border:1px solid black;
width: auto;
Expand Down Expand Up @@ -355,7 +352,7 @@ div#jem td {


.calendarButton {
background-image: -webkit-linear-gradient(top, rgba(230,230,230,1) 0%,rgba(200,200,200,1) 100%);
/* background-image: -webkit-linear-gradient(top, rgba(230,230,230,1) 0%,rgba(200,200,200,1) 100%);
background-image: -moz-linear-gradient(top, rgba(230,230,230,1) 0%,rgba(200,200,200,1) 100%);
background-image: -ms-linear-gradient(top, rgba(230,230,230,1) 0%,rgba(200,200,200,1) 100%);
background-image: -o-linear-gradient(top, rgba(230,230,230,1) 0%,rgba(200,200,200,1) 100%);
Expand All @@ -370,7 +367,7 @@ div#jem td {
width: 48px;
height: 20px;
margin: 1px;
padding: 1px;
padding: 1px; */
display: inline-block;
text-align: center;
color: rgba(0,0,0,1);
Expand Down
6 changes: 5 additions & 1 deletion media/css/jem-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ body.com_jem.body-overlayed {
#jem .jem-list-row {
display: flex;
flex-direction: row;
flex-wrap: wrap;
/* flex-wrap: wrap; */
justify-content: flex-start;
}

Expand Down Expand Up @@ -575,3 +575,7 @@ body.com_jem.body-overlayed {
@media only all and (max-width: 74.938rem) and (min-width: 60rem) {}

@media only all and (min-width: 75rem) {}

#jem .form-check-input{
width:1em !important;
}
20 changes: 18 additions & 2 deletions media/css/jem.css
Original file line number Diff line number Diff line change
Expand Up @@ -559,14 +559,16 @@ div#jem .jem_fright {
--------------------- */

/* J!3 */
#jem .edit .current dd.tabs fieldset legend {
#jem .edit fieldset legend {
width: auto;
float: unset;
}

/*
#jem .edit .current dd.tabs {
border: none;
}

*/
div.jem_editevent ul.adminformlist label {
min-width:160px;
}
Expand Down Expand Up @@ -1227,3 +1229,17 @@ div#jem .buttons {
}

} /* END media print */

#jem.jem_editevent .edit form ul.adminformlist li{
display:flex;
flex-wrap: wrap;
}
#jem.jem_editevent .edit form select[id^="filter_"], #jem.jem_editevent .edit form select, #jem.jem_editevent .edit form input[id^="filter_"]{
min-width:15%;
}
#jem.jem_editevent .edit form input:not([type="checkbox"]):not([type="file"]){
width:auto;
}
#jem.jem_editevent .edit form .form-check .form-check-input{
margin-left : 0px;
}
1 change: 1 addition & 0 deletions media/js/other.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jQuery(document).ready(function($){
var ri = document.getElementById('removeimage');
if (ri) { ri.value = '1'; }
});


});

33 changes: 21 additions & 12 deletions media/js/recurrence.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@ var $select_value;
var $select_element;

function start_recurrencescript(el) {

//window.addEvent('domready', function() {
$content = $("#recurrence_output"); // get the object (position) of the output
$select_element = $(el);
// $content = $("#recurrence_output"); // get the object (position) of the output
$content = document.getElementById('recurrence_output'); // get the object (position) of the output
// $select_element = $("#"+el);
$select_element = document.getElementById(el);

output_recurrencescript(); // start the output
$select_element.on('change', output_recurrencescript); // additional event handler
$("#"+el).on('change', output_recurrencescript); // additional event handler
}

/**
Expand All @@ -26,24 +30,26 @@ function start_recurrencescript(el) {
* @access public
**/
function output_recurrencescript() {

var $select_value = $select_element.value; // the value of the select list

if ($select_value != 0) { // want the user a recurrence
// create an element by the generate_output function
// ** $select_output is an array of all sentences of each type **
var $element = generate_output($select_output[$select_value], $select_value);
$content.replaceChild($element, $content.firstChild); // include the element
set_parameter(); // set the new parameter
if (navigator.appName == "Microsoft Internet Explorer") { // the IE don't know some CSS - classes
$("counter_row").style.display = "inline"; // show the counter for the IE
document.getElementById("counter_row").style.display = "inline"; // show the counter for the IE
} else {
$("counter_row").style.display = "table-row"; // show the counter for the normal browsers
document.getElementById("counter_row").style.display = "table-row"; // show the counter for the normal browsers
}
} else {
$("recurrence_number").value = 0; // set the parameter
document.getElementById("recurrence_number").value = 0; // set the parameter
$nothing = document.createElement("span"); // create a new "empty" element
$nothing.appendChild(document.createTextNode(""));
$content.replaceChild($nothing, $content.firstChild); // replace the old element by the new one
$("counter_row").style.display = "none"; // hide the counter
document.getElementById("counter_row").style.display = "none"; // hide the counter
}
}

Expand All @@ -56,6 +62,7 @@ function output_recurrencescript() {
* @access public
**/
function generate_output($select_output, $select_value) {

var $output_array = $select_output.split("[placeholder]"); // split the output into two parts
var $span = document.createElement("span"); // create a new element
for ($i = 0; $i < $output_array.length; $i++) {
Expand Down Expand Up @@ -106,7 +113,7 @@ function generate_selectlist($select_value) {
}
for ($j = 0; $j < $limit; $j++) {
var $option = document.createElement("option"); // create option element
if ($j == (parseInt($("recurrence_number").value) - 1)) { // the selected - attribute
if ($j == (parseInt(document.getElementById("recurrence_number").value) - 1)) { // the selected - attribute
$option.selected = true;
}
if (($j >= 4) && ($select_value == 4)) { // get the word for "last" and "before last" in the weekday section
Expand Down Expand Up @@ -142,12 +149,14 @@ function generate_selectlist_weekday() {
$selectlist.id = "recurrence_selectlist_weekday";
$selectlist.multiple = true;
$selectlist.size = 7;
var selected = $("recurrence_byday").value.split(','); // array of selected values

var selected =document.getElementById("recurrence_byday").value.split(','); // array of selected values

for ($j = 0; $j < 7; $j++) { // the 7 days
var $option = document.createElement("option"); // create the option - elements
$option.value = $weekday[$j][0]; // add the value
$option.appendChild(document.createTextNode($weekday[$j][1])); // + 1 day because their is no recuring each "0" day
if (selected.contains($option.value)) { // the selected - attribute
if (selected.includes($option.value)) { // the selected - attribute
$option.selected = true;
}
$selectlist.appendChild($option); // include the option - element into the select - element
Expand All @@ -165,7 +174,7 @@ function generate_selectlist_weekday() {
result += this.options[i].value
}
}
$('recurrence_byday').value = result;
document.getElementById('recurrence_byday').value = result;
});
return $selectlist;
}
Expand All @@ -177,5 +186,5 @@ function generate_selectlist_weekday() {
**/
function set_parameter() {
// include the value into the recurrence_number input tag
$("recurrence_number").value = $("recurrence_selectlist").value;
document.getElementById("recurrence_number").value = document.getElementById("recurrence_selectlist").value;
}
52 changes: 27 additions & 25 deletions media/js/seo.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ function switchstart() { // Diese Funktion uebergibt alle relevanten Feldern ein
try {
if ($keyword.length > 0) {
for (var i=0; i < $keyword.length; i++) {
$($keyword[i]).onchange = seo_switch;
document.getElementById($keyword[i]).onchange = seo_switch;
}
}
if ($description_vars.length > 0) {
for (var i=0; i < $description_vars.length; i++) {
$($description_vars[i]).onchange = seo_switch;
document.getElementById($description_vars[i]).onchange = seo_switch;
}
}
} catch(e) {
Expand All @@ -51,7 +51,7 @@ function seo_switch() { // Bei jeder Veraenderung werden beide Funktionen aufger
}

function get_keywords() {
$keywords = $("meta_keywords").value; // Keywords auslesenen
$keywords = $("#meta_keywords").val(); // Keywords auslesenen
var $Nullvalue = "[NULL]";
$manual_keywords = ""; // die Anzeige der nicht zuordbaren Variable wird geleert
$keyword = $keywords.split(","); // in eine Array aufspalten
Expand All @@ -60,7 +60,7 @@ function get_keywords() {
$keyword[i] = $keyword[i].replace(/ /g,"");
$keyword[i] = $keyword[i].replace(/\[/g,"");
$keyword[i] = $keyword[i].replace(/\]/g,"");
$($keyword[i]).value; // ein Fehler wird provoziert, falls dieses Element nicht vorhanden ist
document.getElementById($keyword[i]).value; // ein Fehler wird provoziert, falls dieses Element nicht vorhanden ist
} catch (e) {
if ($manual_keywords != "") { // das nicht verwendete Keyword wird neu abgespeichert
$manual_keywords += ", ";
Expand Down Expand Up @@ -89,7 +89,7 @@ function get_keywords() {
}

function get_description() {
$description = $("meta_description").value; // uebergebene Bechreibung wird aufgerufen und eingefuegt
$description = $("#meta_description").val(); // uebergebene Bechreibung wird aufgerufen und eingefuegt
if ($description != "") {
var Ergebnis = $description.split("["); // alle relevanten Teile werden getrennt
if (Ergebnis.length > 1) {
Expand All @@ -98,7 +98,7 @@ function get_description() {
var inputarray = Ergebnis[i].substring(0,(Ergebnis[i].indexOf("]"))); // die einzelnen Variablen werden aus dem Satz ausgelesen
try { // Die Abfrage wird Fehlersicher gemacht
$description_vars[i-1] = inputarray;
$($description_vars[i-1]).value;
document.getElementById($description_vars[i-1]).value;
} catch (e) {
$description_vars.pop();
continue;
Expand All @@ -118,14 +118,14 @@ function include_keyword() {
if ($keywords != "") {
$keywords += ", ";
}
if($($keyword[i]).tagName == "SELECT") { // es wird unterschieden zwischen normalen Inputfeld und Selectfeld
if ($($keyword[i]).value != 0) { // um auch korrekt abspeichern zu koennen wird das Komma richtig gesetzt
if(document.getElementById($keyword[i]).tagName == "SELECT") { // es wird unterschieden zwischen normalen Inputfeld und Selectfeld
if (document.getElementById($keyword[i]).value != 0) { // um auch korrekt abspeichern zu koennen wird das Komma richtig gesetzt
$keywords += get_selected_option($keyword[i]); // Auslesen des Wertes aus dem Selectfeld
} else {
$keywords += "["+$keyword[i]+"]";
}
} else if ($($keyword[i]).value != "") {
$keywords += $($keyword[i]).value; //Auslesen des Wertes aus dem Inputfeld
} else if (document.getElementById($keyword[i]).value != "") {
$keywords += document.getElementById($keyword[i]).value; //Auslesen des Wertes aus dem Inputfeld
} else {
$keywords += "["+$keyword[i]+"]";
}
Expand All @@ -136,21 +136,21 @@ function include_keyword() {
}
$keywords = $keywords + $manual_keywords;
}
$("meta_keywords").value = $keywords;
document.getElementById("meta_keywords").value = $keywords;
}

function include_description() {
var desc_split, desc_value, desc_length;
var desc_output = $description; // Es wird die urspruengliche Ausgabe abgespeichert, da diese im spaeteren Verlauf geaendert wird
for (var i = 0; i < $description_vars.length; i++) {
desc_value = "["+$description_vars[i]+"]"; // Der Wert wird auf Default gesetzt, damit er ausgegeben werden kann, falls ein deafulteinstellung gewaehlt wird
if ($($description_vars[i]).tagName == "SELECT") { // es wird wieder unterschieden zwischen Select und Inputfeld
if ($($description_vars[i]).value != 0) {
if (document.getElementById($description_vars[i]).tagName == "SELECT") { // es wird wieder unterschieden zwischen Select und Inputfeld
if (document.getElementById($description_vars[i]).value != 0) {
desc_value = get_selected_option($description_vars[i]);
}
} else {
if ($($description_vars[i]).value != "") {
desc_value = $($description_vars[i]).value;
if (document.getElementById($description_vars[i]).value != "") {
desc_value = document.getElementById($description_vars[i]).value;
}
}
desc_split = desc_output.split("["+$description_vars[i]+"]"); // Der Satz wird in zwei Teile geteilt
Expand All @@ -163,19 +163,21 @@ function include_description() {
}
}
}
$("meta_description").value = desc_output;
document.getElementById("meta_description").value = desc_output;
}

function insert_keyword($keyword) {
try {
var $input = $($inputbox).value;

var $input = document.getElementById($inputbox).value;
if ($inputbox == "meta_keywords") {
if ($input != "") {
$input += ",";
}
}

$input += " "+$keyword;
$($inputbox).value = $input;
document.getElementById($inputbox).value = $input;
change_metatags();
} catch(e) {
alert($meta_error);
Expand All @@ -184,29 +186,29 @@ function insert_keyword($keyword) {

function change_metatags() {
if ($inputbox == "meta_keywords") {
$keywords = $($inputbox).value;
$keywords = document.getElementById($inputbox).value;
get_keywords();
} else {
$description = $($inputbox).value;
$description = document.getElementById($inputbox).value;
get_description();
}
switchstart();
}

function get_inputbox($input) {
if ($input == "meta_keywords") {
$($input).value = $keywords;
document.getElementById($input).value = $keywords;
} else {
$($input).value = $description;
document.getElementById($input).value = $description;
}
$inputbox = $input;
}

function get_selected_option($selectfield) {
var $buffer;
for(i= 0; i < $($selectfield).length; i++) {
if($($selectfield).options[i].value == $($selectfield).value) {
$buffer = $($selectfield).options[i].text;
for(i= 0; i < document.getElementById($selectfield).length; i++) {
if(document.getElementById($selectfield).options[i].value == document.getElementById($selectfield).value) {
$buffer = document.getElementById($selectfield).options[i].text;
break;
}
}
Expand Down
Loading

0 comments on commit 447f7c4

Please sign in to comment.