diff --git a/themes/antergos/.gitignore b/themes/antergos/.gitignore new file mode 100644 index 0000000..01d866b --- /dev/null +++ b/themes/antergos/.gitignore @@ -0,0 +1,50 @@ +# Created by .ignore support plugin (hsz.mobi) +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + diff --git a/themes/antergos/README.textile b/themes/antergos/README.textile index aed9af1..f294dd8 100644 --- a/themes/antergos/README.textile +++ b/themes/antergos/README.textile @@ -13,15 +13,15 @@ h2. Screenshots h2. Prerequisites * lightdm -* lightdm-webkit-greeter +* lightdm-webkit2-greeter * antergos-wallpapers (used for the background switcher) -Enable @ligthdm-webkit-greeter@ by editing @/etc/lightdm/lightdm.conf@ and setting @greeter-session@ property to @lightdm-webkit-greeter@ : +Enable @ligthdm-webkit2-greeter@ by editing @/etc/lightdm/lightdm.conf@ and setting @greeter-session@ property to @lightdm-webkit2-greeter@ : bc. [SeatDefaults] #greeter-session=lightdm-gtk-greeter -greeter-session=lightdm-webkit-greeter +greeter-session=lightdm-webkit2-greeter user-session=your-session (gnome,cinnamon,xfce...) h2. Installation @@ -34,7 +34,7 @@ Others can install manually: # Unzip it. # This should create a folder named like @Antergos-lightdm-webkit-theme-antergos-28c4b13@ # Rename this folder to @antergos@ (so that the complete path becomes @/usr/share/lightdm-webkit/themes/antergos@) -# Edit the resource @/etc/lightdm/lightdm-webkit-greeter.conf@ and set @webkit-theme@ property to @antergos@ : +# Edit the resource @/etc/lightdm/lightdm-webkit2-greeter.conf@ and set @webkit-theme@ property to @antergos@ : bc. theme-name=Adwaita diff --git a/themes/antergos/img/thumbs/c65sk3mshowxrtlljbvh.jpg b/themes/antergos/img/thumbs/c65sk3mshowxrtlljbvh.jpg new file mode 100644 index 0000000..c9f71f5 Binary files /dev/null and b/themes/antergos/img/thumbs/c65sk3mshowxrtlljbvh.jpg differ diff --git a/themes/antergos/img/thumbs/morning_light_by_l33tc4k3-d5d2yu0.jpg b/themes/antergos/img/thumbs/morning_light.jpg similarity index 100% rename from themes/antergos/img/thumbs/morning_light_by_l33tc4k3-d5d2yu0.jpg rename to themes/antergos/img/thumbs/morning_light.jpg diff --git a/themes/antergos/img/thumbs/nikon_d40_test_by_desirefire1-d5fghdc.jpg b/themes/antergos/img/thumbs/nikon_d40.jpg similarity index 100% rename from themes/antergos/img/thumbs/nikon_d40_test_by_desirefire1-d5fghdc.jpg rename to themes/antergos/img/thumbs/nikon_d40.jpg diff --git a/themes/antergos/img/thumbs/sky_full_of_stars.jpg b/themes/antergos/img/thumbs/sky_full_of_stars.jpg new file mode 100644 index 0000000..7e2ba90 Binary files /dev/null and b/themes/antergos/img/thumbs/sky_full_of_stars.jpg differ diff --git a/themes/antergos/img/thumbs/solely_by_stevenfields-d5g1c2o.jpg b/themes/antergos/img/thumbs/solely_by_stevenfields.jpg similarity index 100% rename from themes/antergos/img/thumbs/solely_by_stevenfields-d5g1c2o.jpg rename to themes/antergos/img/thumbs/solely_by_stevenfields.jpg diff --git a/themes/antergos/index.html b/themes/antergos/index.html index e1ac733..577cef9 100644 --- a/themes/antergos/index.html +++ b/themes/antergos/index.html @@ -136,6 +136,9 @@ + + + @@ -157,17 +160,20 @@ - - + + - - + + + + + - - + + diff --git a/themes/antergos/index.theme b/themes/antergos/index.theme index 980c9a9..d467dea 100644 --- a/themes/antergos/index.theme +++ b/themes/antergos/index.theme @@ -1,6 +1,6 @@ [theme] name=Antergos -version=2.0.7 +version=2.0.8 description=Antergos Theme engine=lightdm-webkit2-greeter url=index.html diff --git a/themes/antergos/js/greeter.js b/themes/antergos/js/greeter.js index 730f01d..62afadd 100644 --- a/themes/antergos/js/greeter.js +++ b/themes/antergos/js/greeter.js @@ -5,44 +5,44 @@ var users_shown = null; function buildUserList() { // User list building - var userList = document.getElementById('user-list2'); - for (var i in lightdm.users) { - var user = lightdm.users[i]; - var tux = 'img/antergos-logo-user.png'; - var imageSrc = user.image.length > 0 ? user.image : tux; - var lastSession = localStorage.getItem(user.name); - if (lastSession == null || lastSession == undefined) { - localStorage.setItem(user.name, lightdm.default_session); - lastSession = localStorage.getItem(user.name); - } - log('Last Session (' + user.name + '): ' + lastSession); - var li = '' + - '' + user.display_name + ' ' + - '' + user.display_name + '' + - '' + - ''; - $(userList).append(li); - } + var userList = document.getElementById('user-list2'); + for (var i in lightdm.users) { + var user = lightdm.users[i]; + var tux = 'img/antergos-logo-user.png'; + var imageSrc = user.image.length > 0 ? user.image : tux; + var lastSession = localStorage.getItem(user.name); + if (lastSession == null || lastSession == undefined) { + localStorage.setItem(user.name, lightdm.default_session); + lastSession = localStorage.getItem(user.name); + } + log('Last Session (' + user.name + '): ' + lastSession); + var li = '' + + '' + user.display_name + ' ' + + '' + user.display_name + '' + + '' + + ''; + $(userList).append(li); + } } function buildSessionList() { // Build Session List - for (i in lightdm.sessions) { - var session = lightdm.sessions[i]; - var btnGrp = document.getElementById('sessions'); - var theClass = session.name.replace(/ /g, ''); - var button = '\n
  • ' + session.name + '
  • '; + for (i in lightdm.sessions) { + var session = lightdm.sessions[i]; + var btnGrp = document.getElementById('sessions'); + var theClass = session.name.replace(/ /g, ''); + var button = '\n
  • ' + session.name + '
  • '; - $(btnGrp).append(button); + $(btnGrp).append(button); - } + } } function show_users() { - if ($('#collapseOne').hasClass('in')) { - $('#trigger').trigger('click'); - users_shown = true; - } - if ($('#user-list2 a').length <= 1) $('#user-list2 a').trigger('click'); + if ($('#collapseOne').hasClass('in')) { + $('#trigger').trigger('click'); + users_shown = true; + } + if ($('#user-list2 a').length <= 1) $('#user-list2 a').trigger('click'); } /** @@ -50,28 +50,28 @@ function show_users() { */ $(document).ready(function () { - initialize_timer(); - get_hostname(); + initialize_timer(); + get_hostname(); - buildUserList(); - buildSessionList(); - // Password submit when enter key is pressed + buildUserList(); + buildSessionList(); + // Password submit when enter key is pressed - $(document).keydown(function (e) { - checkKey(e); - }); - // Action buttons - addActionLink("shutdown"); - addActionLink("hibernate"); - addActionLink("suspend"); - addActionLink("restart"); + $(document).keydown(function (e) { + checkKey(e); + }); + // Action buttons + addActionLink("shutdown"); + addActionLink("hibernate"); + addActionLink("suspend"); + addActionLink("restart"); }); function get_hostname() { - var hostname = lightdm.hostname; - var hostname_span = document.getElementById('hostname'); - $(hostname_span).append(hostname); + var hostname = lightdm.hostname; + var hostname_span = document.getElementById('hostname'); + $(hostname_span).append(hostname); } /** @@ -81,177 +81,177 @@ function get_hostname() { */ function update_time() { - var time = document.getElementById("current_time"); - var date = new Date(); - var twelveHr = [ - 'sq-al', - 'zh-cn', - 'zh-tw', - 'en-au', - 'en-bz', - 'en-ca', - 'en-cb', - 'en-jm', - 'en-ng', - 'en-nz', - 'en-ph', - 'en-us', - 'en-tt', - 'en-zw', - 'es-us', - 'es-mx']; - var userLang = window.navigator.language; - var is_twelveHr = twelveHr.indexOf(userLang); - var hh = date.getHours(); - var mm = date.getMinutes(); - var suffix = "AM"; - if (hh >= 12) { - suffix = "PM"; - if (is_twelveHr !== -1 && is_twelveHr !== 12) { - hh = hh - 12; - } - } - if (mm < 10) { - mm = "0" + mm; - } - if (hh === 0 && is_twelveHr !== -1) { - hh = 12; - } - time.innerHTML = hh + ":" + mm + " " + suffix; + var time = document.getElementById("current_time"); + var date = new Date(); + var twelveHr = [ + 'sq-al', + 'zh-cn', + 'zh-tw', + 'en-au', + 'en-bz', + 'en-ca', + 'en-cb', + 'en-jm', + 'en-ng', + 'en-nz', + 'en-ph', + 'en-us', + 'en-tt', + 'en-zw', + 'es-us', + 'es-mx']; + var userLang = window.navigator.language; + var is_twelveHr = twelveHr.indexOf(userLang); + var hh = date.getHours(); + var mm = date.getMinutes(); + var suffix = "AM"; + if (hh >= 12) { + suffix = "PM"; + if (is_twelveHr !== -1 && is_twelveHr !== 12) { + hh = hh - 12; + } + } + if (mm < 10) { + mm = "0" + mm; + } + if (hh === 0 && is_twelveHr !== -1) { + hh = 12; + } + time.innerHTML = hh + ":" + mm + " " + suffix; } function initialize_timer() { - var userLang = window.navigator.language; - log(userLang); - update_time(); - setInterval(update_time, 60000); + var userLang = window.navigator.language; + log(userLang); + update_time(); + setInterval(update_time, 60000); } -function checkKey(event){ - var action; - switch (event.which) { - case 13: - action = auth_pending ? submitPassword() : !users_shown ? show_users() : 0; - log(action); - break; - case 27: - action = auth_pending ? cancelAuthentication() : 0; - log(action); - break; - case 32: - action = !users_shown && !auth_pending ? show_users() : 0; - log(action); - break; - default: - break; - } +function checkKey(event) { + var action; + switch (event.which) { + case 13: + action = auth_pending ? submitPassword() : !users_shown ? show_users() : 0; + log(action); + break; + case 27: + action = auth_pending ? cancelAuthentication() : 0; + log(action); + break; + case 32: + action = !users_shown && !auth_pending ? show_users() : 0; + log(action); + break; + default: + break; + } } function addActionLink(id) { - if (eval("lightdm.can_" + id)) { - var label = id.substr(0, 1).toUpperCase() + id.substr(1, id.length - 1); - var id2; - if (id == "shutdown") { - id2 = "power-off" - } - if (id == "hibernate") { - id2 = "asterisk" - } - if (id == "suspend") { - id2 = "arrow-down" - } - if (id == "restart") { - id2 = "refresh" - } - $("#actionsArea").append('\n'); - } + if (eval("lightdm.can_" + id)) { + var label = id.substr(0, 1).toUpperCase() + id.substr(1, id.length - 1); + var id2; + if (id == "shutdown") { + id2 = "power-off" + } + if (id == "hibernate") { + id2 = "asterisk" + } + if (id == "suspend") { + id2 = "arrow-down" + } + if (id == "restart") { + id2 = "refresh" + } + $("#actionsArea").append('\n'); + } } function capitalize(string) { - return string.charAt(0).toUpperCase() + string.slice(1); + return string.charAt(0).toUpperCase() + string.slice(1); } function handleAction(id) { - log("handleAction(" + id + ")"); - eval("lightdm." + id + "()"); + log("handleAction(" + id + ")"); + eval("lightdm." + id + "()"); } function getUserObj(username) { - var user = null; - for (var i = 0; i < lightdm.users.length; ++i) { - if (lightdm.users[i].name == username) { - user = lightdm.users[i]; - break; - } - } - return user; + var user = null; + for (var i = 0; i < lightdm.users.length; ++i) { + if (lightdm.users[i].name == username) { + user = lightdm.users[i]; + break; + } + } + return user; } function getSessionObj(sessionname) { - var session = null; - for (var i = 0; i < lightdm.sessions.length; ++i) { - if (lightdm.sessions[i].name == sessionname) { - session = lightdm.sessions[i]; - break; - } - } - return session; + var session = null; + for (var i = 0; i < lightdm.sessions.length; ++i) { + if (lightdm.sessions[i].name == sessionname) { + session = lightdm.sessions[i]; + break; + } + } + return session; } function startAuthentication(userId) { - log("startAuthentication(" + userId + ")"); - - if (selectedUser !== null) { - lightdm.cancel_authentication(); - localStorage.setItem('selUser', null); - log("authentication cancelled for " + selectedUser); - } - localStorage.setItem('selUser', userId); - selectedUser = '.' + userId; - $(selectedUser).addClass('hovered'); - $(selectedUser).siblings().hide(); - $('.fa-toggle-down').hide(); - - - var usrSession = localStorage.getItem(userId); - - log("usrSession: " + usrSession); - var usrSessionEl = "#" + usrSession; - var usrSessionName = $(usrSessionEl).html(); - log("usrSessionName: " + usrSessionName); - $('.selected').html(usrSessionName); - $('.selected').attr('id', usrSession); - $('#session-list').removeClass('hidden'); - $('#passwordArea').show(); - auth_pending = true; - - lightdm.start_authentication(userId); + log("startAuthentication(" + userId + ")"); + + if (selectedUser !== null) { + lightdm.cancel_authentication(); + localStorage.setItem('selUser', null); + log("authentication cancelled for " + selectedUser); + } + localStorage.setItem('selUser', userId); + selectedUser = '.' + userId; + $(selectedUser).addClass('hovered'); + $(selectedUser).siblings().hide(); + $('.fa-toggle-down').hide(); + + + var usrSession = localStorage.getItem(userId); + + log("usrSession: " + usrSession); + var usrSessionEl = "#" + usrSession; + var usrSessionName = $(usrSessionEl).html(); + log("usrSessionName: " + usrSessionName); + $('.selected').html(usrSessionName); + $('.selected').attr('id', usrSession); + $('#session-list').removeClass('hidden'); + $('#passwordArea').show(); + auth_pending = true; + + lightdm.start_authentication(userId); } function cancelAuthentication() { - log("cancelAuthentication()"); - $('#statusArea').hide(); - $('#timerArea').hide(); - $('#passwordArea').hide(); - $('#session-list').hide(); - if (selectedUser != null) { - lightdm.cancel_authentication(); - log("authentication cancelled for " + selectedUser); - $('.list-group-item.hovered').removeClass('hovered').siblings().show(); - $('.fa-toggle-down').show(); - selectedUser = null; - auth_pending = false; - } - return true; + log("cancelAuthentication()"); + $('#statusArea').hide(); + $('#timerArea').hide(); + $('#passwordArea').hide(); + $('#session-list').hide(); + if (selectedUser != null) { + lightdm.cancel_authentication(); + log("authentication cancelled for " + selectedUser); + $('.list-group-item.hovered').removeClass('hovered').siblings().show(); + $('.fa-toggle-down').show(); + selectedUser = null; + auth_pending = false; + } + return true; } function submitPassword() { - log("provideSecret()"); - lightdm.provide_secret($('#passwordField').val()); - $('#passwordArea').hide(); - $('#timerArea').show(); - log("done"); + log("provideSecret()"); + lightdm.provide_secret($('#passwordField').val()); + $('#passwordArea').hide(); + $('#timerArea').show(); + log("done"); } /** @@ -259,64 +259,64 @@ function submitPassword() { */ function imgNotFound(source) { - source.src = 'img/antergos-logo-user.png'; - source.onerror = ""; - return true; + source.src = 'img/antergos-logo-user.png'; + source.onerror = ""; + return true; } function sessionToggle(el) { - var selText = $(el).text(); - var theID = $(el).attr('id'); - var selUser = localStorage.getItem('selUser'); - $(el).parents('.btn-group').find('.selected').attr('id', theID); - $(el).parents('.btn-group').find('.selected').html(selText); - localStorage.setItem(selUser, theID) + var selText = $(el).text(); + var theID = $(el).attr('id'); + var selUser = localStorage.getItem('selUser'); + $(el).parents('.btn-group').find('.selected').attr('id', theID); + $(el).parents('.btn-group').find('.selected').html(selText); + localStorage.setItem(selUser, theID) } /** * Lightdm Callbacks */ function show_prompt(text) { - log("show_prompt(" + text + ")"); - $('#passwordField').val(""); - $('#passwordArea').show(); - $('#passwordField').focus(); + log("show_prompt(" + text + ")"); + $('#passwordField').val(""); + $('#passwordArea').show(); + $('#passwordField').focus(); } function authentication_complete() { - log("authentication_complete()"); - auth_pending = false; - $('#timerArea').hide(); - var selSession = $('.selected').attr('id'); - if (lightdm.is_authenticated) { - log("authenticated !"); - lightdm.login(lightdm.authentication_user, selSession); - } else { - log("not authenticated !"); - $('#statusArea').show(); - } + log("authentication_complete()"); + auth_pending = false; + $('#timerArea').hide(); + var selSession = $('.selected').attr('id'); + if (lightdm.is_authenticated) { + log("authenticated !"); + lightdm.login(lightdm.authentication_user, selSession); + } else { + log("not authenticated !"); + $('#statusArea').show(); + } } function show_message(text) { - msgWrap = document.getElementById('statusArea'); - showMsg = document.getElementById('showMsg'); - showMsg.innerHTML = text; - if (text.length > 0) { - $('#passwordArea').hide(); - $(msgWrap).show(); - } + msgWrap = document.getElementById('statusArea'); + showMsg = document.getElementById('showMsg'); + showMsg.innerHTML = text; + if (text.length > 0) { + $('#passwordArea').hide(); + $(msgWrap).show(); + } } function show_error(text) { - show_message(text); + show_message(text); } /** * Logs. */ function log(text) { - if (DEBUG) { - $('#logArea').append(text); - $('#logArea').append('
    '); - } + if (DEBUG) { + $('#logArea').append(text); + $('#logArea').append('
    '); + } }