diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index c1b1edca1..dd421a9d9 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -21,6 +21,8 @@ define('ABOUT_AIRTIME_URL' , 'https://www.airtime.pro/support/'); define('AIRTIME_TRANSIFEX_URL' , 'https://www.transifex.com/projects/p/airtime/'); define('WHMCS_PASSWORD_RESET_URL' , 'https://account.sourcefabric.com/pwreset.php'); define('SUPPORT_TICKET_URL' , 'https://sourcefabricberlin.zendesk.com/hc/en-us/requests/new'); +define('UI_REVAMP_EMBED_URL' , 'https://www.youtube.com/embed/nqpNnCKGluY'); +define('UI_REVAMP_YOUTUBE_URL' , 'https://www.youtube.com/watch?v=nqpNnCKGluY&feature=youtu.be'); define('LICENSE_VERSION' , 'GNU AGPL v.3'); define('LICENSE_URL' , 'http://www.gnu.org/licenses/agpl-3.0-standalone.html'); diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index 40bb48484..f5076a691 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -172,6 +172,11 @@ $pages = array( 'label' => _(sprintf("Help Translate %s", PRODUCT_NAME)), 'uri' => AIRTIME_TRANSIFEX_URL, 'target' => "_blank" + ), + array( + 'label' => _('Get to know the new Airtime'), + 'uri' => UI_REVAMP_YOUTUBE_URL, + 'target' => "_blank" ) ) ), diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index 81cebc183..6dbcf786b 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -422,8 +422,9 @@ class LocaleController extends Zend_Controller_Action "Next", "Previous", ": activate to sort column ascending", - ": activate to sort column descending" + ": activate to sort column descending", //End of datatables + "Welcome to the new Airtime Pro!" => _("Welcome to the new Airtime Pro!") ); $this->view->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(true); diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index e2e486415..6558b2bd0 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -169,6 +169,54 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= + + +
+
+ +

+

+
  • +
  • +
  • +
  • + +
    + +
    + + + diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index d02868c75..e4cdd73fb 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -1478,4 +1478,15 @@ class Application_Model_Preference { self::setValue("lang_tz_setup_complete", $value); } + + public static function getWhatsNewDialogViewed() + { + $val = self::getValue("whats_new_dialog_viewed", true); + return empty($val) ? false : $val; + } + + public static function setWhatsNewDialogViewed($value) + { + self::setValue("whats_new_dialog_viewed", $value, true); + } } diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql index 4c2ca0af7..85736f336 100644 --- a/airtime_mvc/build/sql/defaultdata.sql +++ b/airtime_mvc/build/sql/defaultdata.sql @@ -19,6 +19,8 @@ INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_bitrate', '24, 32, 48, 64 INSERT INTO cc_pref("keystr", "valstr") VALUES('num_of_streams', '3'); INSERT INTO cc_pref("keystr", "valstr") VALUES('max_bitrate', '320'); INSERT INTO cc_pref("keystr", "valstr") VALUES('plan_level', 'disabled'); +-- For now, just needs to be truthy - to be updated later; we should find a better way to implement this... +INSERT INTO cc_pref("keystr", "valstr") VALUES('whats_new_dialog_viewed', 1); INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('output_sound_device', 'false', 'boolean'); INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('output_sound_device_type', 'ALSA', 'string'); diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index a36363894..15b2587eb 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -3914,5 +3914,36 @@ li .ui-state-hover { float: left; } +/* UI Revamp Video */ +#whatsnew { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + max-width: 600px; + max-height: 460px; + padding: 10px 0; +} + +#whatsnew > button { + margin-top: 10px; + align-self: flex-end; + flex: 1 0 auto; +} + +#whatsnew > div { + text-align: center; + font-size: 16px; + overflow-x: hidden; +} + +#whatsnew h2 { + margin-top: 10px; + font-weight: bold; +} + +#whatsnew li { + margin-top: 20px; +} \ No newline at end of file