Copy
';c.hasClass("bs-example")?c.before(d.replace(/btn-clipboard/,"btn-clipboard with-example")):b.before(d)});var d=new ZeroClipboard(a(".btn-clipboard")),e=a("#global-zeroclipboard-html-bridge");d.on("load",function(){e.data("placement","top").attr("title","Copy to clipboard").tooltip()}),d.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),d.on("complete",function(){e.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),d.on("noflash wrongflash",function(){e.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery);
\ No newline at end of file
diff --git a/library/AP/client-vendor/after-body/20-bootstarp-addOns/ie10-viewport-bug-workaround.js b/library/AP/client-vendor/after-body/20-bootstarp-addOns/ie10-viewport-bug-workaround.js
deleted file mode 100755
index 7f53b61..0000000
--- a/library/AP/client-vendor/after-body/20-bootstarp-addOns/ie10-viewport-bug-workaround.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*!
- * IE10 viewport hack for Surface/desktop Windows 8 bug
- * Copyright 2014 Twitter, Inc.
- * Licensed under the Creative Commons Attribution 3.0 Unported License. For
- * details, see http://creativecommons.org/licenses/by/3.0/.
- */
-
-// See the Getting Started docs for more information:
-// http://getbootstrap.com/getting-started/#support-ie10-width
-
-(function () {
- 'use strict';
- if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
- var msViewportStyle = document.createElement('style')
- msViewportStyle.appendChild(
- document.createTextNode(
- '@-ms-viewport{width:auto!important}'
- )
- )
- document.querySelector('head').appendChild(msViewportStyle)
- }
-})();
diff --git a/library/AP/client-vendor/after-body/jquery.highlight/jquery.highlight.js b/library/AP/client-vendor/after-body/jquery.highlight/jquery.highlight.js
new file mode 100755
index 0000000..4d339ee
--- /dev/null
+++ b/library/AP/client-vendor/after-body/jquery.highlight/jquery.highlight.js
@@ -0,0 +1,53 @@
+/*
+
+highlight v3
+
+Highlights arbitrary terms.
+
+User account
+{/box_header} +{form name='AP_Form_AccountUser'} +{formField name='email' label='Your Email'} +{formField label='Password' prepend="{button_link label='Change Password' class="changePassword"}"} +{formAction action='Save' label='Save' theme='highlight'} +{/form} +{/box} + +{box} +{box_header} +Tokens
+{/box_header} +{component name='AP_Component_TokenList'} +{/box} + +{*{box}*} +{*{box_header}*} + {*Company account
*} +{*{/box_header}*} + {*// ADD form*} + {**} + {*
*} + {*
- *}
+ {*
- company name *} + {*
- Address *} + {*
- business *} + {*
- ... *} + {*
Feed List | ApplicationName: {$application->getName()}
+{/box_header} +-
+ {foreach $feedList as $feed}
+
- + {$feed->getId()} | + {$feed->getName()} | + {$feed->getChannelId()} | + {button_link page='AP_Page_Feed' application=$application->getId() feed=$feed->getId() label='view'} + {button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteFeed' data=['feed-id'=>$feed->getId(), 'application-id'=>$application->getId(), 'click-confirmed' => true]} + + {/foreach} +
+
+{/box}
diff --git a/library/AP/layout/default/Component/ApplicationForm/default.tpl b/library/AP/layout/default/Component/ApplicationForm/default.tpl
new file mode 100755
index 0000000..16ad680
--- /dev/null
+++ b/library/AP/layout/default/Component/ApplicationForm/default.tpl
@@ -0,0 +1,9 @@
+{form name='AP_Form_Application' application=$application}
+{formField name='name' label='Name'}
+{formField name='description' label='Description'}
+{if $application}
+ {formAction action='Save' label='Save' theme='highlight'}
+{else}
+ {formAction action='Create' label='Create' theme='highlight'}
+{/if}
+{/form}
diff --git a/library/AP/layout/default/Component/ApplicationList/default.less b/library/AP/layout/default/Component/ApplicationList/default.less
new file mode 100755
index 0000000..142c81e
--- /dev/null
+++ b/library/AP/layout/default/Component/ApplicationList/default.less
@@ -0,0 +1,3 @@
+.form-application {
+ margin-bottom: 12px;
+}
diff --git a/library/AP/layout/default/Component/ApplicationList/default.tpl b/library/AP/layout/default/Component/ApplicationList/default.tpl
new file mode 100755
index 0000000..7890a1b
--- /dev/null
+++ b/library/AP/layout/default/Component/ApplicationList/default.tpl
@@ -0,0 +1,10 @@
+Add new Feed
+
+ {component name='AP_Component_FeedForm' application=$application}
+
+
+
+
+{foreach $applicationList as $application}
+ {component name='AP_Component_ApplicationViewSmall' application=$application}
+{/foreach}
diff --git a/library/AP/layout/default/Component/ApplicationView/default.less b/library/AP/layout/default/Component/ApplicationView/default.less
new file mode 100755
index 0000000..d760147
--- /dev/null
+++ b/library/AP/layout/default/Component/ApplicationView/default.less
@@ -0,0 +1,3 @@
+.form-application {
+ margin-top: 12px;
+}
diff --git a/library/AP/layout/default/Component/ApplicationView/default.tpl b/library/AP/layout/default/Component/ApplicationView/default.tpl
new file mode 100755
index 0000000..654ec3b
--- /dev/null
+++ b/library/AP/layout/default/Component/ApplicationView/default.tpl
@@ -0,0 +1,18 @@
+{box}
+{box_header}
+ created: {$application->getCreated()|date_format}
+ Add new Application
+
+ {component name='AP_Component_ApplicationForm'}
+
+Application name: {$application->getName()}
+{/box_header} +
+ {button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteApplication' data=['application-id'=>$application->getId(), 'click-confirmed' => true]}
+
+{$application->getDescription()}
+
+
+{/box}
+
+{component name='AP_Component_ApplicationFeedList' application=$application}
diff --git a/library/AP/layout/default/Component/ApplicationViewSmall/default.less b/library/AP/layout/default/Component/ApplicationViewSmall/default.less
new file mode 100755
index 0000000..674bd5e
--- /dev/null
+++ b/library/AP/layout/default/Component/ApplicationViewSmall/default.less
@@ -0,0 +1,18 @@
+.feed {
+ .actions {
+ text-align: right;
+ }
+}
+
+.form-feedAdd {
+ margin-top: 12px;
+}
+
+.CM_FormField_Text {
+ overflow: hidden;
+}
+
+.AP_Form_Feed .button, {
+ float: right;
+ margin: 0 0 0 5px;
+}
diff --git a/library/AP/layout/default/Component/ApplicationViewSmall/default.tpl b/library/AP/layout/default/Component/ApplicationViewSmall/default.tpl
new file mode 100755
index 0000000..8b50c1f
--- /dev/null
+++ b/library/AP/layout/default/Component/ApplicationViewSmall/default.tpl
@@ -0,0 +1,11 @@
+{box}
+{box_header}
+ created: {$application->getCreated()|date_format}
+ Edit Application
+
+ {component name='AP_Component_ApplicationForm' application=$application}
+
+ {$application->getName()}
+{/box_header} +
+ {button_link page='AP_Page_Application' application=$application->getId() label='view'}
+ {button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteApplication' data=['application-id'=>$application->getId(), 'click-confirmed' => true]}
+
+ +{/box} diff --git a/library/AP/layout/default/Component/AuthRequired/default.less b/library/AP/layout/default/Component/AuthRequired/default.less new file mode 100755 index 0000000..1bcfdc7 --- /dev/null +++ b/library/AP/layout/default/Component/AuthRequired/default.less @@ -0,0 +1,33 @@ +& { + padding: 5px; +} + +.floatbox & { + background-color: @colorBg; +} + +.menu-tabs { + text-align: left; + margin-bottom: 6px; + padding: 0; + + .link:hover .label { + text-decoration: none; + } +} + +.tabs-content { + padding: 5px; +} + +.AP_Component_SignUp { + .signUpHeading { + display: none; + } +} + +.AP_Component_SignIn { + .visitor { + display: none; + } +} diff --git a/library/AP/layout/default/Component/AuthRequired/default.tpl b/library/AP/layout/default/Component/AuthRequired/default.tpl new file mode 100755 index 0000000..bbd4ba8 --- /dev/null +++ b/library/AP/layout/default/Component/AuthRequired/default.tpl @@ -0,0 +1,16 @@ + +
+
diff --git a/library/AP/layout/default/Component/ChangePassword/default.tpl b/library/AP/layout/default/Component/ChangePassword/default.tpl
new file mode 100755
index 0000000..d4a5958
--- /dev/null
+++ b/library/AP/layout/default/Component/ChangePassword/default.tpl
@@ -0,0 +1,8 @@
+{box title='Change Password'}
+{form name='AP_Form_ChangePassword'}
+{formField name='old_password' label='Old Password'}
+{formField name='new_password' label='New Password'}
+{formField name='new_password_confirm' label='Confirm Password'}
+{formAction action='Process' label='Change'}
+{/form}
+{/box}
diff --git a/library/AP/layout/default/Component/FeedEntryList/default.less b/library/AP/layout/default/Component/FeedEntryList/default.less
new file mode 100755
index 0000000..9363f52
--- /dev/null
+++ b/library/AP/layout/default/Component/FeedEntryList/default.less
@@ -0,0 +1,5 @@
+.feed {
+ .actions {
+ text-align: right;
+ }
+}
diff --git a/library/AP/layout/default/Component/FeedEntryList/default.tpl b/library/AP/layout/default/Component/FeedEntryList/default.tpl
new file mode 100755
index 0000000..236335d
--- /dev/null
+++ b/library/AP/layout/default/Component/FeedEntryList/default.tpl
@@ -0,0 +1,15 @@
+{box}
+{box_header}
+ Amount: {$entryList->getCount()}
+
+ {component name='AP_Component_SignUp'}
+
+
+ {component name='AP_Component_SignIn'}
+
+Entry List | FeedName: {$feed->getName()}
+{/box_header} +-
+ {foreach $entryList as $entry}
+
- + {$entry->getId()} | + {$entry->getData()} | + {button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteEntry' data=['entry-id'=>$entry->getId(), 'feed-id'=>$feed->getId(), 'application-id'=>$application->getId(), 'click-confirmed' => true]} + + {/foreach} +
Feed name: {$feed->getName()}
+{/box_header} +
+ {button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteFeed' data=['application-id'=>$application->getId(), 'feed-id'=>$feed->getId(), 'click-confirmed' => true]}
+
+{$feed->getChannelId()}
+{$feed->getDescription()}
+
+
+{/box}
+
+{component name='AP_Component_FeedEntryList' application=$application feed=$feed}
diff --git a/library/AP/layout/default/Component/Header/default.tpl b/library/AP/layout/default/Component/Header/default.tpl
deleted file mode 100644
index 660c8c1..0000000
--- a/library/AP/layout/default/Component/Header/default.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
diff --git a/library/AP/layout/default/Component/HeaderBar/default.less b/library/AP/layout/default/Component/HeaderBar/default.less
new file mode 100755
index 0000000..037aa5d
--- /dev/null
+++ b/library/AP/layout/default/Component/HeaderBar/default.less
@@ -0,0 +1,269 @@
+& {
+ max-width: 990px;
+ margin: 0 auto;
+ min-height: @barSize;
+}
+
+.bar {
+ position: relative;
+
+ &.search-expand {
+ .navButton, .navButton.search, .logo {
+ display: none;
+ }
+
+ .searchForm {
+ display: block;
+ width: 100%;
+ }
+ }
+}
+
+.navButton {
+ &.navigation {
+ float: left;
+ }
+
+ &.indication {
+ position: relative;
+ float: left;
+ opacity: 1;
+ padding: 0 4px;
+ min-width: 0;
+
+ &.empty {
+ opacity: .5;
+
+ .counter {
+ display: none;
+ }
+
+ &:hover {
+ opacity: 1;
+ }
+ }
+ .counter {
+ position: relative;
+ display: inline-block;
+ .nowrap;
+ top: -7px;
+ left: -6px;
+ max-width: 25px;
+ padding: 2px 3px;
+ border-radius: 2px;
+ background-color: @colorNotice;
+ font-size: @fontSizeTiny;
+ line-height: 1;
+ box-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
+ text-shadow: 1px 1px rgba(0, 0, 0, 0.2);
+
+ &:empty {
+ display: none;
+ }
+ }
+ }
+
+ &.search {
+ float: right;
+ display: none;
+
+ @media (max-width: 549px) {
+ display: block;
+ }
+ }
+
+ &.chat {
+ float: right;
+
+ &.unread {
+ opacity: 1;
+
+ .icon-chat {
+ display: block;
+ .animation(blink, 1500ms, ease, 0, infinite);
+ }
+ }
+ }
+
+ &.add {
+ float: right;
+ position: relative;
+ transition: 200ms;
+
+ .icon {
+ display: inline-block;
+ transition: 200ms;
+ }
+
+ &.active {
+ opacity: 1;
+
+ .icon {
+ transform: rotate(45deg);
+ }
+
+ &:after {
+ .triangle(transparent, transparent, darken(@colorBg, 1), transparent, 6px);
+ top: auto;
+ bottom: 0;
+ left: 50%;
+ margin-left: -6px;
+ transform: translate(0, 0);
+ opacity: 1;
+ transition: 200ms;
+ }
+
+ &.hideTriangle {
+ &:after {
+ transform: translate(0, 6px);
+ opacity: 0;
+ }
+ }
+ }
+ }
+}
+
+.logo.monochrome {
+ display: block;
+ float: left;
+ height: @barSize;
+ background-size: 65%;
+ background-image: image('logo-monochrome.svg');
+
+ html.no-svg & {
+ background-image: image('logo-monochrome.png');
+ }
+
+ &:not(.viewer) {
+ float: none;
+ margin: 8px auto 0;
+ width: 140px;
+ background-size: 100%;
+
+ @media (min-width: 550px) {
+ float: left;
+ margin: 10px 12px;
+ }
+ }
+
+ &.viewer {
+ width: @barSize;
+ background-image: image('logo-monochrome-mini.svg');
+
+ html.no-svg & {
+ background-image: image('logo-monochrome-mini.png');
+ }
+
+ @media (min-width: 420px) {
+ width: 100px;
+ margin: 0 8px;
+ background-size: 85%;
+ background-image: image('logo-monochrome.svg');
+
+ html.no-svg & {
+ background-image: image('logo-monochrome.png');
+ }
+ }
+ }
+}
+
+.searchForm {
+ box-sizing: border-box;
+ display: none;
+ position: relative;
+ float: right;
+ padding: 0 6px;
+ width: 200px;
+
+ @media (min-width: 550px) {
+ display: block;
+ }
+
+ @media (min-width: 660px) {
+ width: 300px;
+ }
+
+ height: @barSize;
+ line-height: @barSize - 2px;
+
+ .AP_Form_SearchContent {
+ display: inline-block;
+ width: 100%;
+ vertical-align: middle;
+ line-height: 1;
+
+ .CM_FormField_Text {
+ .textinput {
+ background-color: fadeout(@colorBg, 85);
+ border-color: transparent;
+ color: @colorFgTheme;
+
+ &:focus {
+ border-color: fadeout(@colorBg, 50);
+ }
+ }
+ .placeholder(@colorFgTheme);
+ }
+ }
+
+ .icon-search {
+ pointer-events: none;
+ position: absolute;
+ color: @colorFgTheme;
+ top: 2px;
+ right: 12px;
+ opacity: .6;
+ }
+}
+
+.AP_Component_SignIn {
+ text-align: center;
+
+ .AP_Form_SignIn {
+ box-sizing: border-box;
+ padding: 5px 10px;
+ }
+
+ @media (min-width: 550px) {
+ text-align: right;
+
+ .visitor {
+ &:after {
+ left: 10%;
+ }
+ }
+ }
+
+ @media (min-width: 800px) {
+ .AP_Form_SignIn {
+ float: right;
+ }
+
+ .visitor {
+ float: left;
+ margin: 8px;
+ padding: 7px;
+
+ &:after {
+ border-bottom-color: transparent;
+ border-right-color: fadeout(@colorFg, 80);
+ top: 50%;
+ left: -16px;
+ margin-left: 0;
+ margin-top: -8px;
+ }
+ }
+ }
+
+ .small {
+ color: darken(@colorFgTheme, 10);
+
+ &:hover {
+ color: @colorFgTheme;
+ }
+ }
+
+ .formField-error {
+ color: lighten(@colorNotice, 30);
+ }
+}
diff --git a/library/AP/layout/default/Component/HeaderBar/default.tpl b/library/AP/layout/default/Component/HeaderBar/default.tpl
new file mode 100755
index 0000000..3eaf18a
--- /dev/null
+++ b/library/AP/layout/default/Component/HeaderBar/default.tpl
@@ -0,0 +1,7 @@
+
diff --git a/library/AP/layout/default/Component/Navigation/default.less b/library/AP/layout/default/Component/Navigation/default.less
new file mode 100755
index 0000000..04840d0
--- /dev/null
+++ b/library/AP/layout/default/Component/Navigation/default.less
@@ -0,0 +1,135 @@
+& {
+ height: 100%;
+ overflow-y: hidden;
+
+ &:hover {
+ overflow-y: auto;
+ }
+}
+
+.main {
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ padding-bottom: 20px;
+
+ a {
+ color: darken(@colorFgTheme, 30);
+
+ &:hover {
+ background-color: darken(@colorFg, 10);
+
+ .icon {
+ color: lighten(@colorFgSubtle, 45);
+ }
+ }
+ }
+
+ > .menu-sub {
+ position: relative;
+
+ > li {
+ position: relative;
+
+ > a {
+ padding-left: 12px;
+ padding-right: 12px;
+ color: darken(@colorFgTheme, 30);
+ text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
+
+ .icon {
+ color: @colorFgSubtle;
+ font-size: 15px;
+ margin-right: 14px;
+ }
+
+ &:hover {
+ .icon {
+ color: lighten(@colorFgSubtle, 25);
+ }
+ }
+
+ &:active {
+ background-color: fadeout(@colorBg, 90);
+ }
+
+ }
+ &.active {
+ position: relative;
+
+ > a {
+ position: relative;
+ background-color: transparent;
+ font-weight: bold;
+ color: darken(@colorFgTheme, 20);
+
+ .icon {
+ color: @colorFgHeading;
+ }
+ }
+
+ &:after {
+ .triangle(transparent, @colorBgBody, transparent, transparent, 7px);
+ top: 20px;
+ left: auto;
+ right: 0;
+
+ .offCanvas-active & {
+ display: none;
+ }
+ }
+
+ }
+
+ &.AP_Page_Account_Premium > a {
+ color: @colorPremium;
+
+ .icon {
+ color: @colorPremium;
+ }
+ }
+ }
+ }
+
+ hr {
+ border-top: 1px solid lighten(@colorFg, 5);
+ margin: 0;
+ }
+
+ .button.logout {
+ display: block;
+ width: 100%;
+ height: auto;
+ margin: 0;
+ padding: 8px 12px;
+ border: 0;
+ font-weight: normal;
+ background: none;
+ filter: none;
+ color: darken(@colorFgTheme, 30);
+ text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
+ font-size: @fontSize;
+ text-align: left;
+
+ .label {
+ line-height: 1;
+ vertical-align: baseline;
+ }
+
+ .icon {
+ font-size: 15px;
+ margin-right: 14px;
+ display: inline-block;
+ width: 1.25em;
+ text-align: center;
+ color: @colorFgSubtle;
+ }
+
+ &:hover {
+ background-color: darken(@colorFg, 10);
+
+ .icon {
+ color: lighten(@colorFgSubtle, 25);
+ }
+ }
+ }
+}
diff --git a/library/AP/layout/default/Component/Navigation/default.tpl b/library/AP/layout/default/Component/Navigation/default.tpl
old mode 100644
new mode 100755
index 69d2d3a..ac2fc65
--- a/library/AP/layout/default/Component/Navigation/default.tpl
+++ b/library/AP/layout/default/Component/Navigation/default.tpl
@@ -1,16 +1,7 @@
-
-
-{**}
-{**}
+
diff --git a/library/AP/layout/default/Component/SignIn/default.less b/library/AP/layout/default/Component/SignIn/default.less
new file mode 100755
index 0000000..3a007ff
--- /dev/null
+++ b/library/AP/layout/default/Component/SignIn/default.less
@@ -0,0 +1,103 @@
+.floatbox & {
+ background-color: @colorBg;
+}
+
+.AP_Form_SignIn {
+ text-align: left;
+ max-width: 100%;
+
+ @media (min-width: 400px) {
+ display: inline-block;
+ }
+}
+
+.formField, .formAction {
+ padding: 6px 12px;
+
+ @media (min-width: 400px) {
+ width: auto;
+ float: left;
+ padding: 0;
+
+ .CM_FormField_Text {
+ padding-right: 5px;
+
+ input {
+ width: 130px;
+ }
+ }
+ }
+}
+
+.formField {
+ @media (min-width: 400px) {
+
+ .CM_FormField_Text {
+ padding-right: 5px;
+
+ input {
+ width: 130px;
+ }
+ }
+ }
+
+ > .input {
+ margin: 0;
+ }
+}
+
+.formAction {
+ text-align: center;
+
+ .button {
+ margin: 0;
+ }
+}
+
+.CM_FormField_Boolean {
+ line-height: normal;
+
+ input[type=checkbox] + label {
+ margin-left: 16px;
+
+ &:before {
+ left: -16px;
+ margin-top: -6px;
+ width: 12px;
+ height: 12px;
+ }
+ }
+}
+
+.small {
+ font-size: 10px;
+ color: @colorFgSubtle;
+ display: inline-block;
+
+ &:hover {
+ color: @colorFg;
+ text-decoration: none;
+ }
+}
+
+.visitor {
+ position: relative;
+ padding: 10px;
+ border-top: @colorFgBorderEmphasize1;
+ background-color: fadeout(@colorFg, 80);
+ text-align: center;
+
+ h2 {
+ color: @colorFgTheme;
+ margin-right: 5px;
+ display: inline-block;
+ line-height: @sizeButton+2;
+ }
+
+ &:after {
+ .triangle(transparent, transparent, fadeout(@colorFg, 80), transparent, 8px);
+ top: -8px;
+ left: 50%;
+ margin-left: -4px;
+ }
+}
diff --git a/library/AP/layout/default/Component/SignIn/default.tpl b/library/AP/layout/default/Component/SignIn/default.tpl
new file mode 100755
index 0000000..826429d
--- /dev/null
+++ b/library/AP/layout/default/Component/SignIn/default.tpl
@@ -0,0 +1,6 @@
+{form name='AP_Form_SignIn'}
+{formField name='login' class="noLabel" tabindex=1 placeholder='Username/Email' autocorrect="off" autocapitalize="off"}
+{formField class="noLabel" name='password' tabindex=2 placeholder='Password'}
+{formAction action='Process' theme='highlight' label='Login'}
+{/form}
+
diff --git a/library/AP/layout/default/Component/SignUp/default.less b/library/AP/layout/default/Component/SignUp/default.less
new file mode 100755
index 0000000..c7b3c58
--- /dev/null
+++ b/library/AP/layout/default/Component/SignUp/default.less
@@ -0,0 +1,33 @@
+& {
+ width: 450px;
+ max-width: 100%;
+}
+
+.floatbox & {
+ background-color: @colorBg;
+}
+
+.signUpHeading {
+ margin: 0;
+ padding: 12px 12px 0;
+ text-align: center;
+}
+
+.agreement {
+ margin: 7px 0;
+ font-size: @fontSizeTiny;
+ text-align: center;
+}
+
+.AP_Form_SignUp {
+ padding: 12px;
+}
+
+.formField {
+ padding: 6px 0;
+ width: 426px; // Workaround IE9 Select2 in floatbox expanding bug
+}
+
+.formAction {
+ text-align: center;
+}
diff --git a/library/AP/layout/default/Component/SignUp/default.tpl b/library/AP/layout/default/Component/SignUp/default.tpl
new file mode 100755
index 0000000..af3be0e
--- /dev/null
+++ b/library/AP/layout/default/Component/SignUp/default.tpl
@@ -0,0 +1,6 @@
+{form name='AP_Form_SignUp'}
+{formField name='email' label='Your Email'}
+{formField name='username' label='Username' autocorrect="off" autocapitalize="off"}
+{formField name='password' label='Password'}
+{formAction action='Create' label='Sign Up' theme='highlight' class="button-large"}
+{/form}
diff --git a/library/AP/layout/default/Component/TokenList/default.less b/library/AP/layout/default/Component/TokenList/default.less
new file mode 100755
index 0000000..0da0c2b
--- /dev/null
+++ b/library/AP/layout/default/Component/TokenList/default.less
@@ -0,0 +1,12 @@
+.form-tokenAdd {
+ margin-top: 12px;
+}
+
+.CM_FormField_Text {
+ overflow: hidden;
+}
+
+.AP_Form_Token .button, {
+ float: right;
+ margin: 0 0 0 5px;
+}
diff --git a/library/AP/layout/default/Component/TokenList/default.tpl b/library/AP/layout/default/Component/TokenList/default.tpl
new file mode 100755
index 0000000..4935025
--- /dev/null
+++ b/library/AP/layout/default/Component/TokenList/default.tpl
@@ -0,0 +1,33 @@
+Edit Feed
+
+ {component name='AP_Component_FeedForm' application=$application feed=$feed}
+
+ -
+ {*
- *} + {*FHSDJKFH897SD98F7DS98 | Token name*} + {*{button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteToken' data=['click-confirmed' => true]}*} + {* *} + {*
- *} + {*FHSDJKFH897SD98F7DS98 | Token name*} + {*{button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteToken' data=['click-confirmed' => true]}*} + {* *} + {*
- *} + {*FHSDJKFH897SD98F7DS98 | Token name*} + {*{button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteToken' data=['click-confirmed' => true]}*} + {* *} + + {foreach $tokenList as $token} +
- + {$token->getToken()} | + {$token->getName()} | + {button_link title='Delete' icon='delete' iconConfirm='delete-confirm' class='warning deleteToken' data=['click-confirmed' => true]} + + {/foreach} + + +
+
diff --git a/library/AP/layout/default/Layout/Default/default.less b/library/AP/layout/default/Layout/Default/default.less
new file mode 100755
index 0000000..e027cbe
--- /dev/null
+++ b/library/AP/layout/default/Layout/Default/default.less
@@ -0,0 +1,80 @@
+#header {
+ .gradient(vertical, lighten(@colorBgTheme, 5), darken(@colorBgTheme, 10));
+ box-shadow: inset 0 -4px 10px 0 rgba(0, 0, 0, .1);
+}
+
+#headerWrapper {
+ min-height: @barSize;
+
+ #header {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 50;
+ transform: translateZ(0);
+
+ &.no-fixed {
+ position: relative;
+ }
+ }
+}
+
+#navigation {
+ position: absolute;
+ top: 0;
+ width: 260px;
+ max-width: 100%;
+ right: 100%;
+ z-index: 71;
+ background-color: @colorBgOffCanvas;
+}
+
+#middle {
+ position: relative;
+}
+
+#page {
+ position: relative;
+ min-height: 200px;
+
+ @media (min-height: @breakpointSmall) {
+ min-height: 300px;
+ }
+}
+
+
+.navButton {
+ height: @barSize;
+ min-width: @barSize;
+ line-height: @barSize;
+ display: block;
+ text-decoration: none;
+ text-align: center;
+ color: @colorFgTheme;
+ font-size: 18px;
+ opacity: .5;
+ text-shadow: 1px 1px rgba(0, 0, 0, 0.1);
+
+ &:hover {
+ opacity: 1;
+ }
+}
+
+@media (min-width: @breakpointMedium) {
+ #middle {
+ margin-left: 260px;
+ }
+
+ #navigation {
+ position: fixed;
+ transform: translateZ(0);
+ left: 0;
+ bottom: 0;
+ top: 44px;
+ }
+
+ .navButton.navigation {
+ display: none;
+ }
+}
diff --git a/library/AP/layout/default/Layout/Default/default.tpl b/library/AP/layout/default/Layout/Default/default.tpl
old mode 100644
new mode 100755
index 3915ca2..0552989
--- a/library/AP/layout/default/Layout/Default/default.tpl
+++ b/library/AP/layout/default/Layout/Default/default.tpl
@@ -1,31 +1,23 @@
-
-
-
-
-
-
- Add new Token
+
+ {form name='AP_Form_Token'}
+ {formField name='name' placeholder='Token name' class="noLabel" prepend="{button action='Create' theme="highlight" label='Create'}"}
+ {/form}
+
+
-
- {resourceJs file='after-body.js' type="vendor"}
- {resourceJs file='library.js' type="library"}
- {if $render->getLanguage()}
- {resourceJs file="translations/{CM_Model_Language::getVersionJavascript()}.js" type="library"}
- {/if}
- {$render->getGlobalResponse()->getHtml()}
-
-
+{extends file=$render->getLayoutPath('Layout/Abstract/default.tpl', 'CM')}
+
+{block name='body-start'}
+ {component name='AP_Component_Alerts'}
+{/block}
+
+{block name='body'}
+
-
-
-
- {$renderAdapter->fetchPage()}
-
-
+
+ {block name='header'}
+ {component name='AP_Component_HeaderBar'}
+ {/block}
+
+
+
+
+
+ {$renderAdapter->fetchPage()}
+
+
+{/block}
diff --git a/library/AP/layout/default/Layout/Default/title.tpl b/library/AP/layout/default/Layout/Default/title.tpl
old mode 100644
new mode 100755
diff --git a/library/AP/layout/default/Layout/Index/default.less b/library/AP/layout/default/Layout/Index/default.less
new file mode 100644
index 0000000..06f32a0
--- /dev/null
+++ b/library/AP/layout/default/Layout/Index/default.less
@@ -0,0 +1,7 @@
+#middle, #header {
+ margin-left: 0;
+}
+
+#page {
+ max-width: none;
+}
diff --git a/library/AP/layout/default/Layout/Index/default.tpl b/library/AP/layout/default/Layout/Index/default.tpl
new file mode 100644
index 0000000..54375aa
--- /dev/null
+++ b/library/AP/layout/default/Layout/Index/default.tpl
@@ -0,0 +1,7 @@
+{extends file=$render->getLayoutPath('Layout/Default/default.tpl', 'AP')}
+
+{block name='body'}
+
+ {block name='content-title'}
+{/block}
+
+{block name='after'}
+
+{/block}
diff --git a/library/AP/layout/default/Page/Account/default.tpl b/library/AP/layout/default/Page/Account/default.tpl
new file mode 100755
index 0000000..908841e
--- /dev/null
+++ b/library/AP/layout/default/Page/Account/default.tpl
@@ -0,0 +1,5 @@
+{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
+
+{block name='content-main'}
+ {component name='AP_Component_Account'}
+{/block}
diff --git a/library/AP/layout/default/Page/Account/title.tpl b/library/AP/layout/default/Page/Account/title.tpl
new file mode 100644
index 0000000..171e128
--- /dev/null
+++ b/library/AP/layout/default/Page/Account/title.tpl
@@ -0,0 +1 @@
+Account
diff --git a/library/AP/layout/default/Page/Application/default.tpl b/library/AP/layout/default/Page/Application/default.tpl
old mode 100644
new mode 100755
index cde3a4d..c027d37
--- a/library/AP/layout/default/Page/Application/default.tpl
+++ b/library/AP/layout/default/Page/Application/default.tpl
@@ -1,35 +1,5 @@
{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
{block name='content-main'}
- {$pageTitle|escape}
{/block} + {block name='content-main'}{/block} +
-
-
-
-
+ {component name='AP_Component_ApplicationView' application=$application}
{/block}
diff --git a/library/AP/layout/default/Page/Application/title.tpl b/library/AP/layout/default/Page/Application/title.tpl
deleted file mode 100644
index b2ce346..0000000
--- a/library/AP/layout/default/Page/Application/title.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Application
diff --git a/library/AP/layout/default/Page/ApplicationOverview/default.tpl b/library/AP/layout/default/Page/ApplicationOverview/default.tpl
new file mode 100755
index 0000000..b1d842c
--- /dev/null
+++ b/library/AP/layout/default/Page/ApplicationOverview/default.tpl
@@ -0,0 +1,5 @@
+{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
+
+{block name='content-main'}
+ {component name='AP_Component_ApplicationList'}
+{/block}
diff --git a/library/AP/layout/default/Page/ApplicationOverview/title.tpl b/library/AP/layout/default/Page/ApplicationOverview/title.tpl
new file mode 100644
index 0000000..bb848b5
--- /dev/null
+++ b/library/AP/layout/default/Page/ApplicationOverview/title.tpl
@@ -0,0 +1 @@
+Application Overview
diff --git a/library/AP/layout/default/Page/Contact/default.tpl b/library/AP/layout/default/Page/Contact/default.tpl
new file mode 100755
index 0000000..8887006
--- /dev/null
+++ b/library/AP/layout/default/Page/Contact/default.tpl
@@ -0,0 +1,5 @@
+{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
+
+{block name='content-main'}
+ Contact
+{/block}
diff --git a/library/AP/layout/default/Page/Error_AuthRequired/default.tpl b/library/AP/layout/default/Page/Error_AuthRequired/default.tpl
new file mode 100644
index 0000000..bdcfbd7
--- /dev/null
+++ b/library/AP/layout/default/Page/Error_AuthRequired/default.tpl
@@ -0,0 +1,7 @@
+{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
+
+{block name='content-title'}{/block}
+
+{block name='content-main'}
+ {component name='AP_Component_SignUp'}
+{/block}
diff --git a/library/AP/layout/default/Page/Error_AuthRequired/title.tpl b/library/AP/layout/default/Page/Error_AuthRequired/title.tpl
new file mode 100644
index 0000000..b763c95
--- /dev/null
+++ b/library/AP/layout/default/Page/Error_AuthRequired/title.tpl
@@ -0,0 +1 @@
+{translate 'Create an Account or Sign In'}
diff --git a/library/AP/layout/default/Page/Feed/default.less b/library/AP/layout/default/Page/Feed/default.less
new file mode 100755
index 0000000..e42cc02
--- /dev/null
+++ b/library/AP/layout/default/Page/Feed/default.less
@@ -0,0 +1,6 @@
+
+.entry {
+ .actions {
+ text-align: right;
+ }
+}
diff --git a/library/AP/layout/default/Page/Feed/default.tpl b/library/AP/layout/default/Page/Feed/default.tpl
old mode 100644
new mode 100755
index f7da708..ae8e420
--- a/library/AP/layout/default/Page/Feed/default.tpl
+++ b/library/AP/layout/default/Page/Feed/default.tpl
@@ -1,5 +1,5 @@
{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
{block name='content-main'}
- Feed content
+ {component name='AP_Component_FeedView' application=$application feed=$feed}
{/block}
diff --git a/library/AP/layout/default/Page/Feed/title.tpl b/library/AP/layout/default/Page/Feed/title.tpl
index 06bffc6..9364c9c 100644
--- a/library/AP/layout/default/Page/Feed/title.tpl
+++ b/library/AP/layout/default/Page/Feed/title.tpl
@@ -1 +1 @@
-Feed
+Feed name
diff --git a/library/AP/layout/default/Page/FeedOverview/default.less b/library/AP/layout/default/Page/FeedOverview/default.less
new file mode 100755
index 0000000..e69de29
diff --git a/library/AP/layout/default/Page/FeedOverview/default.tpl b/library/AP/layout/default/Page/FeedOverview/default.tpl
new file mode 100755
index 0000000..4eb12db
--- /dev/null
+++ b/library/AP/layout/default/Page/FeedOverview/default.tpl
@@ -0,0 +1,5 @@
+{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
+
+{block name='content-main'}
+ {component name='AP_Component_FeedList'}
+{/block}
diff --git a/library/AP/layout/default/Page/FeedOverview/title.tpl b/library/AP/layout/default/Page/FeedOverview/title.tpl
new file mode 100644
index 0000000..51b0df8
--- /dev/null
+++ b/library/AP/layout/default/Page/FeedOverview/title.tpl
@@ -0,0 +1 @@
+Feed Overview
diff --git a/library/AP/layout/default/Page/Feedback/default.tpl b/library/AP/layout/default/Page/Feedback/default.tpl
new file mode 100755
index 0000000..3990042
--- /dev/null
+++ b/library/AP/layout/default/Page/Feedback/default.tpl
@@ -0,0 +1,5 @@
+{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
+
+{block name='content-main'}
+ Feedback
+{/block}
diff --git a/library/AP/layout/default/Page/Index/default.tpl b/library/AP/layout/default/Page/Index/default.tpl
old mode 100644
new mode 100755
index 930e320..a334be8
--- a/library/AP/layout/default/Page/Index/default.tpl
+++ b/library/AP/layout/default/Page/Index/default.tpl
@@ -1,5 +1,7 @@
{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
{block name='content-main'}
- Overview content
+ Index
+ {component name='AP_Component_SignIn'}
+ {component name='AP_Component_SignUp'}
{/block}
diff --git a/library/AP/layout/default/Page/Overview/default.tpl b/library/AP/layout/default/Page/Overview/default.tpl
new file mode 100755
index 0000000..ef65b78
--- /dev/null
+++ b/library/AP/layout/default/Page/Overview/default.tpl
@@ -0,0 +1,14 @@
+{extends file=$render->getLayoutPath('Page/Abstract/default.tpl')}
+
+{block name='content-main'}
+ maybe we remove this for now?Application Overview
- | Id | -Name | -Actions | -|
|---|---|---|---|
| 1 | -Mark | -edit | -|
| 2 | -Jacob | -Thornton | -@fat | -
| 3 | -Larry | -the Bird | -
+ when we can show some stats then this page makes sense.
+ also we could show some ads for premium account
+ +
+ +
-
+
- basic stats (amount applications/feeds/feedEntries) +
- ??? +
List of Users
+ {/box_header} +-
+
- + ms@example.com + {button_link title='Send invite' icon='send'} + {button_link title='Send invite' icon='delete'} + +
- + ms@example.com + {button_link title='Send invite' icon='send'} + {button_link title='Send invite' icon='delete'} + +
- + ms@example.com + {button_link title='Send invite' icon='send'} + {button_link title='Send invite' icon='delete'} + + +
User roles
+ {/box_header} +| + | Application | +Feed | +User | +||||||
|---|---|---|---|---|---|---|---|---|---|
| User | +View | +Edit | +Delete | +View | +Edit | +Delete | +Add | +Edit | +Delete | +
| ms@example.com | +{input name="application_view" class='noLabel' display='switch'} | +{input name="application_edit" class='noLabel' display='switch'} | +{input name="application_delete" class='noLabel' display='switch'} | +{input name="feed_view" class='noLabel' display='switch'} | +{input name="feed_edit" class='noLabel' display='switch'} | +{input name="feed_delete" class='noLabel' display='switch'} | +{input name="user_view" class='noLabel' display='switch'} | +{input name="user_edit" class='noLabel' display='switch'} | +{input name="user_delete" class='noLabel' display='switch'} | + {/form} +
| ms@example.com | +{input name="application_view" class='noLabel' display='switch'} | +{input name="application_edit" class='noLabel' display='switch'} | +{input name="application_delete" class='noLabel' display='switch'} | +{input name="feed_view" class='noLabel' display='switch'} | +{input name="feed_edit" class='noLabel' display='switch'} | +{input name="feed_delete" class='noLabel' display='switch'} | +{input name="user_view" class='noLabel' display='switch'} | +{input name="user_edit" class='noLabel' display='switch'} | +{input name="user_delete" class='noLabel' display='switch'} | + {/form} +
| ms@example.com | +{input name="application_view" class='noLabel' display='switch'} | +{input name="application_edit" class='noLabel' display='switch'} | +{input name="application_delete" class='noLabel' display='switch'} | +{input name="feed_view" class='noLabel' display='switch'} | +{input name="feed_edit" class='noLabel' display='switch'} | +{input name="feed_delete" class='noLabel' display='switch'} | +{input name="user_view" class='noLabel' display='switch'} | +{input name="user_edit" class='noLabel' display='switch'} | +{input name="user_delete" class='noLabel' display='switch'} | + {/form} +
' + ' + ')
' + '
' + '');
+ if (_.isFunction(link)) {
+ var handler = this;
+ $alert.on('click', function() {
+ link.call(handler);
+ });
+ } else {
+ $alert.attr('href', link);
+ }
+ var maxAlerts = 3;
+ this.$el.children(':lt(' + -(maxAlerts - 1) + ')').stop(true).transition({x: '-20px'}, '400ms', 'snap', function() {
+ $(this).remove();
+ });
+
+ $alert.stop().appendTo(this.$el).transition({x: '100%'}, '400ms', 'snap', function() {
+ $(this).delay(8000).transition({x: '-20px'}, '400ms', 'snap', function() {
+ $(this).remove();
+ });
+ });
+ },
+
+ /**
+ * @param {Object} action
+ * @param {Object} model
+ * @param {Object} data
+ */
+ _onActionConversationMessage: function(action, model, data) {
+ if (action.actor.id != cm.viewer.id) {
+ var mailbox = cm.findView('AP_Component_Mailbox');
+ if (!mailbox || !mailbox.isConversationVisible(model.conversation.id)) {
+ this.addMessage(action.actor, cm.language.get('{$user} sent you a message.', {user: cm.user.getUsernameHtml(action.actor, {href: false})}), 'mailbox', cm.getUrl(model.path));
+ }
+ }
+ }
+});
diff --git a/library/AP/library/AP/Component/Alerts.php b/library/AP/library/AP/Component/Alerts.php
new file mode 100755
index 0000000..7dbd1b2
--- /dev/null
+++ b/library/AP/library/AP/Component/Alerts.php
@@ -0,0 +1,5 @@
+getParams()->get('application');
+
+ $viewResponse->set('application', $application);
+ $viewResponse->set('feedList', $application->getFeedList());
+ }
+
+ public function ajax_deleteFeed(CM_Params $params, CM_Frontend_JavascriptContainer_View $handler, CM_Response_View_Ajax $response) {
+ $applicationId = $params->getString('applicationId');
+ $feedId = (string) $params->get('feedId');
+
+ $client = AP_Helper::getClient();
+ $client->feed->delete($applicationId, $feedId);
+
+ $handler->message('Success: Feed delete.');
+ $application = AP_Helper::getApplication($applicationId);
+ $response->reloadComponent(['application' => $application]);
+ }
+}
diff --git a/library/AP/library/AP/Component/ApplicationForm.js b/library/AP/library/AP/Component/ApplicationForm.js
new file mode 100755
index 0000000..d05ce5c
--- /dev/null
+++ b/library/AP/library/AP/Component/ApplicationForm.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Component_ApplicationForm
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_ApplicationForm = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_ApplicationForm'
+});
diff --git a/library/AP/library/AP/Component/ApplicationForm.php b/library/AP/library/AP/Component/ApplicationForm.php
new file mode 100755
index 0000000..5941cc1
--- /dev/null
+++ b/library/AP/library/AP/Component/ApplicationForm.php
@@ -0,0 +1,14 @@
+getParams();
+ $application = null;
+ if ($params->has('application')) {
+ $application = $this->getParams()->get('application');
+ }
+
+ $viewResponse->set('application', $application);
+ }
+}
diff --git a/library/AP/library/AP/Component/ApplicationList.js b/library/AP/library/AP/Component/ApplicationList.js
new file mode 100755
index 0000000..619f16f
--- /dev/null
+++ b/library/AP/library/AP/Component/ApplicationList.js
@@ -0,0 +1,30 @@
+/**
+ * @class AP_Component_ApplicationList
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_ApplicationList = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_ApplicationList',
+
+ events: {
+ 'click .deleteApplication': function(e) {
+ var applicationId = $(e.currentTarget).data('application-id');
+ this.deleteApplication(applicationId);
+ return false;
+ }
+ },
+
+ childrenEvents: {
+ 'AP_Form_Application success': function() {
+ this.reload();
+ }
+ },
+
+ /**
+ * @param {Number} applicationId
+ */
+ deleteApplication: function(applicationId) {
+ this.ajax('deleteApplication', {'applicationId': applicationId});
+ }
+});
diff --git a/library/AP/library/AP/Component/ApplicationList.php b/library/AP/library/AP/Component/ApplicationList.php
new file mode 100755
index 0000000..1fd0d4d
--- /dev/null
+++ b/library/AP/library/AP/Component/ApplicationList.php
@@ -0,0 +1,21 @@
+application->getList();
+
+ $viewResponse->set('applicationList', $applicationList);
+ }
+
+ public function ajax_deleteApplication(CM_Params $params, CM_Frontend_JavascriptContainer_View $handler, CM_Response_View_Ajax $response) {
+ $applicationId = $params->getString('applicationId');
+
+ $client = AP_Helper::getClient();
+ $client->application->delete($applicationId);
+
+ $handler->message('Success: Application delete.');
+ $response->reloadComponent();
+ }
+}
diff --git a/library/AP/library/AP/Component/ApplicationView.js b/library/AP/library/AP/Component/ApplicationView.js
new file mode 100755
index 0000000..49e3736
--- /dev/null
+++ b/library/AP/library/AP/Component/ApplicationView.js
@@ -0,0 +1,30 @@
+/**
+ * @class AP_Component_ApplicationView
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_ApplicationView = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_ApplicationView',
+
+ events: {
+ 'click .deleteApplication': function(e) {
+ var applicationId = $(e.currentTarget).data('application-id');
+ this.deleteApplication(applicationId);
+ return false;
+ }
+ },
+
+ childrenEvents: {
+ 'AP_Form_Application success': function() {
+ this.reload();
+ }
+ },
+
+ /**
+ * @param {Number} applicationId
+ */
+ deleteApplication: function(applicationId) {
+ this.ajax('deleteApplication', {'applicationId': applicationId});
+ }
+});
diff --git a/library/AP/library/AP/Component/ApplicationView.php b/library/AP/library/AP/Component/ApplicationView.php
new file mode 100755
index 0000000..1ee8a84
--- /dev/null
+++ b/library/AP/library/AP/Component/ApplicationView.php
@@ -0,0 +1,21 @@
+getParams()->getString('application');
+ $application = AP_Helper::getApplication($applicationId);
+
+ $viewResponse->set('application', $application);
+ }
+
+ public function ajax_deleteApplication(CM_Params $params, CM_Frontend_JavascriptContainer_View $handler, CM_Response_View_Ajax $response) {
+ $applicationId = $params->getString('applicationId');
+
+ $client = AP_Helper::getClient();
+ $client->application->delete($applicationId);
+
+ $handler->message('Success: Application delete.');
+ $response->redirect('AP_Page_ApplicationOverview');
+ }
+}
diff --git a/library/AP/library/AP/Component/ApplicationViewSmall.js b/library/AP/library/AP/Component/ApplicationViewSmall.js
new file mode 100755
index 0000000..5f593a6
--- /dev/null
+++ b/library/AP/library/AP/Component/ApplicationViewSmall.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Component_ApplicationViewSmall
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_ApplicationViewSmall = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_ApplicationViewSmall'
+});
diff --git a/library/AP/library/AP/Component/ApplicationViewSmall.php b/library/AP/library/AP/Component/ApplicationViewSmall.php
new file mode 100755
index 0000000..f828fe6
--- /dev/null
+++ b/library/AP/library/AP/Component/ApplicationViewSmall.php
@@ -0,0 +1,15 @@
+getViewer(true)->getRoles()->contains(AP_Role::ADMIN)) {
+ // throw new CM_Exception_NotAllowed();
+ }
+ }
+
+ public function prepare(CM_Frontend_Environment $environment, CM_Frontend_ViewResponse $viewResponse) {
+ $application = $this->getParams()->get('application');
+ $viewResponse->set('application', $application);
+ }
+}
diff --git a/library/AP/library/AP/Component/AuthRequired.js b/library/AP/library/AP/Component/AuthRequired.js
new file mode 100755
index 0000000..7c0f2ea
--- /dev/null
+++ b/library/AP/library/AP/Component/AuthRequired.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Component_AuthRequired
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_AuthRequired = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_AuthRequired'
+});
diff --git a/library/AP/library/AP/Component/AuthRequired.php b/library/AP/library/AP/Component/AuthRequired.php
new file mode 100755
index 0000000..39b0ede
--- /dev/null
+++ b/library/AP/library/AP/Component/AuthRequired.php
@@ -0,0 +1,10 @@
+_params->getBoolean('hadViewer', false);
+
+ $viewResponse->set('hadViewer', $hadViewer);
+ }
+}
diff --git a/library/AP/library/AP/Component/ChangePassword.js b/library/AP/library/AP/Component/ChangePassword.js
new file mode 100644
index 0000000..b2a7e84
--- /dev/null
+++ b/library/AP/library/AP/Component/ChangePassword.js
@@ -0,0 +1,7 @@
+/**
+ * @class AP_Component_ChangePassword
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_ChangePassword = AP_Component_Abstract.extend({
+ _class: 'AP_Component_ChangePassword'
+});
diff --git a/library/AP/library/AP/Component/ChangePassword.php b/library/AP/library/AP/Component/ChangePassword.php
new file mode 100755
index 0000000..e0df89d
--- /dev/null
+++ b/library/AP/library/AP/Component/ChangePassword.php
@@ -0,0 +1,8 @@
+_checkViewer($environment);
+ }
+}
diff --git a/library/AP/library/AP/Component/FeedEntryList.js b/library/AP/library/AP/Component/FeedEntryList.js
new file mode 100755
index 0000000..e360203
--- /dev/null
+++ b/library/AP/library/AP/Component/FeedEntryList.js
@@ -0,0 +1,28 @@
+/**
+ * @class AP_Component_FeedEntryList
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_FeedEntryList = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_FeedEntryList',
+
+ events: {
+ 'click .deleteEntry': function(e) {
+ var applicationId = $(e.currentTarget).data('application-id');
+ var feedId = $(e.currentTarget).data('feed-id');
+ var entryId = $(e.currentTarget).data('entry-id');
+ this.deleteEntry(applicationId, feedId, entryId);
+ return false;
+ }
+ },
+
+ /**
+ * @param {Number} applicationId
+ * @param {Number} feedId
+ * @param {Number} entryId
+ */
+ deleteEntry: function(applicationId, feedId, entryId) {
+ this.ajax('deleteEntry', {'applicationId': applicationId, 'feedId': feedId, 'entryId': entryId});
+ }
+});
diff --git a/library/AP/library/AP/Component/FeedEntryList.php b/library/AP/library/AP/Component/FeedEntryList.php
new file mode 100755
index 0000000..a233da3
--- /dev/null
+++ b/library/AP/library/AP/Component/FeedEntryList.php
@@ -0,0 +1,29 @@
+getParams()->get('application');
+ $feed = $this->getParams()->get('feed');
+
+ $viewResponse->set('application', $application);
+ $viewResponse->set('feed', $feed);
+ $viewResponse->set('entryList', $feed->getEntryList());
+ }
+
+ public function ajax_deleteEntry(CM_Params $params, CM_Frontend_JavascriptContainer_View $handler, CM_Response_View_Ajax $response) {
+ $applicationId = $params->getString('applicationId');
+ $feedId = $params->getString('feedId');
+ $entryId = (string) $params->get('entryId');
+
+ $client = AP_Helper::getClient();
+ $client->entry->delete($applicationId, $feedId, $entryId);
+
+ $handler->message('Success: Entry delete.');
+
+ $application = AP_Helper::getApplication($applicationId);
+ $feed = AP_Helper::getFeed($applicationId, $feedId);
+ $response->reloadComponent(['application' => $application, 'feed' => $feed]);
+ }
+}
diff --git a/library/AP/library/AP/Component/FeedForm.js b/library/AP/library/AP/Component/FeedForm.js
new file mode 100755
index 0000000..ca1fedd
--- /dev/null
+++ b/library/AP/library/AP/Component/FeedForm.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Component_FeedForm
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_FeedForm = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_FeedForm'
+});
diff --git a/library/AP/library/AP/Component/FeedForm.php b/library/AP/library/AP/Component/FeedForm.php
new file mode 100755
index 0000000..95a2391
--- /dev/null
+++ b/library/AP/library/AP/Component/FeedForm.php
@@ -0,0 +1,16 @@
+getParams();
+ $application = $params->get('application');
+ $feed = null;
+ if ($params->has('feed')) {
+ $feed = $this->getParams()->get('feed');
+ }
+
+ $viewResponse->set('application', $application);
+ $viewResponse->set('feed', $feed);
+ }
+}
diff --git a/library/AP/library/AP/Component/FeedList.js b/library/AP/library/AP/Component/FeedList.js
new file mode 100755
index 0000000..026c81e
--- /dev/null
+++ b/library/AP/library/AP/Component/FeedList.js
@@ -0,0 +1,15 @@
+/**
+ * @class AP_Component_FeedList
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_FeedList = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_FeedList',
+
+ childrenEvents: {
+ 'AP_Form_Feed success': function() {
+ this.reload();
+ }
+ }
+});
diff --git a/library/AP/library/AP/Component/FeedList.php b/library/AP/library/AP/Component/FeedList.php
new file mode 100755
index 0000000..aa8fd9c
--- /dev/null
+++ b/library/AP/library/AP/Component/FeedList.php
@@ -0,0 +1,11 @@
+application->getList();
+
+ $viewResponse->set('applicationList', $applicationList);
+ }
+}
diff --git a/library/AP/library/AP/Component/FeedView.js b/library/AP/library/AP/Component/FeedView.js
new file mode 100755
index 0000000..0aaf829
--- /dev/null
+++ b/library/AP/library/AP/Component/FeedView.js
@@ -0,0 +1,32 @@
+/**
+ * @class AP_Component_FeedView
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_FeedView = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_FeedView',
+
+ events: {
+ 'click .deleteFeed': function(e) {
+ var applicationId = $(e.currentTarget).data('application-id');
+ var feedId = $(e.currentTarget).data('feed-id');
+ this.deleteFeed(applicationId, feedId);
+ return false;
+ }
+ },
+
+ childrenEvents: {
+ 'AP_Form_Feed success': function() {
+ this.reload();
+ }
+ },
+
+ /**
+ * @param {Number} applicationId
+ * @param {Number} feedId
+ */
+ deleteFeed: function(applicationId, feedId) {
+ this.ajax('deleteFeed', {'applicationId': applicationId, 'feedId': feedId});
+ }
+});
diff --git a/library/AP/library/AP/Component/FeedView.php b/library/AP/library/AP/Component/FeedView.php
new file mode 100755
index 0000000..c468a72
--- /dev/null
+++ b/library/AP/library/AP/Component/FeedView.php
@@ -0,0 +1,25 @@
+getParams()->getString('application');
+ $application = AP_Helper::getApplication($applicationId);
+ $feedId = $this->getParams()->getString('feed');
+ $feed = AP_Helper::getFeed($applicationId, $feedId);
+
+ $viewResponse->set('application', $application);
+ $viewResponse->set('feed', $feed);
+ }
+
+ public function ajax_deleteFeed(CM_Params $params, CM_Frontend_JavascriptContainer_View $handler, CM_Response_View_Ajax $response) {
+ $applicationId = $params->getString('applicationId');
+ $feedId = $params->getString('feedId');
+
+ $client = AP_Helper::getClient();
+ $client->feed->delete($applicationId, $feedId);
+
+ $handler->message('Success: Feed delete.');
+ $response->redirect('AP_Page_FeedOverview');
+ }
+}
diff --git a/library/AP/library/AP/Component/Header.js b/library/AP/library/AP/Component/Header.js
deleted file mode 100755
index c80665f..0000000
--- a/library/AP/library/AP/Component/Header.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @class AP_Component_Header
- * @extends AP_Component_Abstract
- */
-var AP_Component_Header = AP_Component_Abstract.extend({
-
- /** @type String */
- _class: 'AP_Component_Header'
-});
diff --git a/library/AP/library/AP/Component/Header.php b/library/AP/library/AP/Component/Header.php
deleted file mode 100644
index d9f9216..0000000
--- a/library/AP/library/AP/Component/Header.php
+++ /dev/null
@@ -1,5 +0,0 @@
-getRequest()->getSession()->deleteUser();
+ $response->getRequest()->getSession()->setLifetime();
+
+ $response->redirect($redirectPage, null, true);
+ }
}
diff --git a/library/AP/library/AP/Component/SignIn.js b/library/AP/library/AP/Component/SignIn.js
new file mode 100755
index 0000000..60c2347
--- /dev/null
+++ b/library/AP/library/AP/Component/SignIn.js
@@ -0,0 +1,19 @@
+/**
+ * @class AP_Component_SignIn
+ * @extends AP_Component_Abstract
+ */
+var AP_Component_SignIn = AP_Component_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Component_SignIn',
+
+ ready: function() {
+ var handler = this;
+ this.$('.forgotPW').click(function() {
+ handler.loadComponent('AP_Component_ForgotPassword');
+ });
+ this.$('.signup').click(function() {
+ handler.loadComponent('AP_Component_SignUp');
+ });
+ }
+});
diff --git a/library/AP/library/AP/Component/SignIn.php b/library/AP/library/AP/Component/SignIn.php
new file mode 100755
index 0000000..ad8ea59
--- /dev/null
+++ b/library/AP/library/AP/Component/SignIn.php
@@ -0,0 +1,5 @@
+token->getList();
+
+ $viewResponse->set('tokenList', $tokenList);
+ }
+
+ public function ajax_deleteToken(CM_Params $params, CM_Frontend_JavascriptContainer_View $handler, CM_Response_View_Ajax $response) {
+ $token = $params->getString('token');
+
+ $client = AP_Helper::getClient();
+ $client->token->delete($token);
+
+ $handler->message('Success: Token delete.');
+ $response->reloadComponent();
+ }
+}
diff --git a/library/AP/library/AP/Form/AccountUser.js b/library/AP/library/AP/Form/AccountUser.js
new file mode 100755
index 0000000..dd7e4a4
--- /dev/null
+++ b/library/AP/library/AP/Form/AccountUser.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Form_AccountUser
+ * @extends CM_Form_Abstract
+ */
+var AP_Form_AccountUser = CM_Form_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Form_AccountUser'
+});
diff --git a/library/AP/library/AP/Form/AccountUser.php b/library/AP/library/AP/Form/AccountUser.php
new file mode 100755
index 0000000..96216ab
--- /dev/null
+++ b/library/AP/library/AP/Form/AccountUser.php
@@ -0,0 +1,15 @@
+registerField(new CM_FormField_Email(['name' => 'email']));
+ $this->registerField(new CM_FormField_Password(['name' => 'password']));
+
+ $this->registerAction(new AP_FormAction_AccountUser_Save($this));
+ }
+
+ public function prepare(CM_Frontend_Environment $environment) {
+ $this->getField('email')->setValue($environment->getViewer(true)->getEmail());
+ }
+}
diff --git a/library/AP/library/AP/Form/Application.js b/library/AP/library/AP/Form/Application.js
new file mode 100755
index 0000000..b8b7df1
--- /dev/null
+++ b/library/AP/library/AP/Form/Application.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Form_Application
+ * @extends CM_Form_Abstract
+ */
+var AP_Form_Application = CM_Form_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Form_Application'
+});
diff --git a/library/AP/library/AP/Form/Application.php b/library/AP/library/AP/Form/Application.php
new file mode 100755
index 0000000..7cec782
--- /dev/null
+++ b/library/AP/library/AP/Form/Application.php
@@ -0,0 +1,24 @@
+registerField(new CM_FormField_Hidden(['name' => 'applicationId']));
+ $this->registerField(new CM_FormField_Text(['name' => 'name']));
+ $this->registerField(new CM_FormField_Textarea(['name' => 'description']));
+
+ $this->registerAction(new AP_FormAction_Application_Create($this));
+ $this->registerAction(new AP_FormAction_Application_Save($this));
+ }
+
+ public function prepare(CM_Frontend_Environment $environment) {
+ $params = $this->getParams();
+ if ($params->has('application')) {
+ /** @var \Feedlabs\Feedify\Resource\Application $application */
+ $application = $params->get('application');
+ $this->getField('applicationId')->setValue($application->getId());
+ $this->getField('name')->setValue($application->getName());
+ $this->getField('description')->setValue($application->getDescription());
+ }
+ }
+}
diff --git a/library/AP/library/AP/Form/ChangePassword.js b/library/AP/library/AP/Form/ChangePassword.js
new file mode 100644
index 0000000..564d96a
--- /dev/null
+++ b/library/AP/library/AP/Form/ChangePassword.js
@@ -0,0 +1,7 @@
+/**
+ * @class AP_Form_ChangePassword
+ * @extends CM_Form_Abstract
+ */
+var AP_Form_ChangePassword = CM_Form_Abstract.extend({
+ _class: 'AP_Form_ChangePassword'
+});
diff --git a/library/AP/library/AP/Form/ChangePassword.php b/library/AP/library/AP/Form/ChangePassword.php
new file mode 100755
index 0000000..79363e5
--- /dev/null
+++ b/library/AP/library/AP/Form/ChangePassword.php
@@ -0,0 +1,12 @@
+registerField(new CM_FormField_Password(['name' => 'old_password']));
+ $this->registerField(new CM_FormField_Password(['name' => 'new_password']));
+ $this->registerField(new CM_FormField_Password(['name' => 'new_password_confirm']));
+
+ $this->registerAction(new AP_FormAction_ChangePassword_Process($this));
+ }
+}
diff --git a/library/AP/library/AP/Form/Feed.js b/library/AP/library/AP/Form/Feed.js
new file mode 100755
index 0000000..b456ee6
--- /dev/null
+++ b/library/AP/library/AP/Form/Feed.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Form_Feed
+ * @extends CM_Form_Abstract
+ */
+var AP_Form_Feed = CM_Form_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Form_Feed'
+});
diff --git a/library/AP/library/AP/Form/Feed.php b/library/AP/library/AP/Form/Feed.php
new file mode 100755
index 0000000..74f6f33
--- /dev/null
+++ b/library/AP/library/AP/Form/Feed.php
@@ -0,0 +1,29 @@
+registerField(new CM_FormField_Hidden(['name' => 'applicationId']));
+ $this->registerField(new CM_FormField_Hidden(['name' => 'feedId']));
+ $this->registerField(new CM_FormField_Text(['name' => 'name']));
+ $this->registerField(new CM_FormField_Textarea(['name' => 'description']));
+
+ $this->registerAction(new AP_FormAction_Feed_Create($this));
+ $this->registerAction(new AP_FormAction_Feed_Save($this));
+ }
+
+ public function prepare(CM_Frontend_Environment $environment) {
+ $params = $this->getParams();
+ /** @var \Feedlabs\Feedify\Resource\Application $application */
+ $application = $params->get('application');
+ $this->getField('applicationId')->setValue($application->getId());
+
+ if ($params->has('feed')) {
+ /** @var \Feedlabs\Feedify\Resource\Feed $feed */
+ $feed = $params->get('feed');
+ $this->getField('feedId')->setValue($feed->getId());
+ $this->getField('name')->setValue($feed->getName());
+ $this->getField('description')->setValue($feed->getDescription());
+ }
+ }
+}
diff --git a/library/AP/library/AP/Form/SignIn.js b/library/AP/library/AP/Form/SignIn.js
new file mode 100755
index 0000000..bd34be2
--- /dev/null
+++ b/library/AP/library/AP/Form/SignIn.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Form_SignIn
+ * @extends CM_Form_Abstract
+ */
+var AP_Form_SignIn = CM_Form_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Form_SignIn'
+});
diff --git a/library/AP/library/AP/Form/SignIn.php b/library/AP/library/AP/Form/SignIn.php
new file mode 100755
index 0000000..e4ef77d
--- /dev/null
+++ b/library/AP/library/AP/Form/SignIn.php
@@ -0,0 +1,12 @@
+registerField(new CM_FormField_Text(['name' => 'login']));
+ $this->registerField(new CM_FormField_Password(['name' => 'password']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'remember_me']));
+
+ $this->registerAction(new AP_FormAction_SignIn_Process($this));
+ }
+}
diff --git a/library/AP/library/AP/Form/SignUp.js b/library/AP/library/AP/Form/SignUp.js
new file mode 100755
index 0000000..fdd2504
--- /dev/null
+++ b/library/AP/library/AP/Form/SignUp.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Form_SignUp
+ * @extends CM_Form_Abstract
+ */
+var AP_Form_SignUp = CM_Form_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Form_SignUp'
+});
diff --git a/library/AP/library/AP/Form/SignUp.php b/library/AP/library/AP/Form/SignUp.php
new file mode 100755
index 0000000..ba0230d
--- /dev/null
+++ b/library/AP/library/AP/Form/SignUp.php
@@ -0,0 +1,12 @@
+registerField(new AP_FormField_Username(['name' => 'username']));
+ $this->registerField(new CM_FormField_Email(['name' => 'email']));
+ $this->registerField(new CM_FormField_Password(['name' => 'password']));
+
+ $this->registerAction(new AP_FormAction_SignUp_Create($this));
+ }
+}
diff --git a/library/AP/library/AP/Form/Token.js b/library/AP/library/AP/Form/Token.js
new file mode 100755
index 0000000..247ffe6
--- /dev/null
+++ b/library/AP/library/AP/Form/Token.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Form_Token
+ * @extends CM_Form_Abstract
+ */
+var AP_Form_Token = CM_Form_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Form_Token'
+});
diff --git a/library/AP/library/AP/Form/Token.php b/library/AP/library/AP/Form/Token.php
new file mode 100755
index 0000000..f4c03e3
--- /dev/null
+++ b/library/AP/library/AP/Form/Token.php
@@ -0,0 +1,10 @@
+registerField(new CM_FormField_Text(['name' => 'name']));
+
+ $this->registerAction(new AP_FormAction_Token_Create($this));
+ }
+}
diff --git a/library/AP/library/AP/Form/UserPermissions.js b/library/AP/library/AP/Form/UserPermissions.js
new file mode 100755
index 0000000..c0ca86a
--- /dev/null
+++ b/library/AP/library/AP/Form/UserPermissions.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Form_UserPermissions
+ * @extends CM_Form_Abstract
+ */
+var AP_Form_UserPermissions = CM_Form_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Form_UserPermissions'
+});
diff --git a/library/AP/library/AP/Form/UserPermissions.php b/library/AP/library/AP/Form/UserPermissions.php
new file mode 100755
index 0000000..f59970e
--- /dev/null
+++ b/library/AP/library/AP/Form/UserPermissions.php
@@ -0,0 +1,21 @@
+registerField(new CM_FormField_Boolean(['name' => 'application_view']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'application_edit']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'application_delete']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'feed_view']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'feed_edit']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'feed_delete']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'user_view']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'user_edit']));
+ $this->registerField(new CM_FormField_Boolean(['name' => 'user_delete']));
+ }
+
+ public function prepare(CM_Frontend_Environment $environment) {
+ $user = $this->getParams()->getString('user');
+ // todo: get user permissions over API and set to formFields
+ }
+}
diff --git a/library/AP/library/AP/FormAction/AccountUser/Save.php b/library/AP/library/AP/FormAction/AccountUser/Save.php
new file mode 100755
index 0000000..69c4c91
--- /dev/null
+++ b/library/AP/library/AP/FormAction/AccountUser/Save.php
@@ -0,0 +1,30 @@
+getViewer(true);
+ $email = $params->getString('email');
+ if ($email != $user->getEmail()) {
+ if (AP_Model_User::findEmail($email)) {
+ $response->addError('This email address is already used.', 'email');
+ }
+ }
+ }
+
+ protected function _process(CM_Params $params, CM_Response_View_Form $response, CM_Form_Abstract $form) {
+ $email = $params->getString('email');
+ /** @var AP_Model_User $viewer */
+ $viewer = $response->getViewer(true);
+ $viewer->setEmail($email);
+
+ // todo: update userinfo over API
+
+ $response->addMessage('Success: Account infos save.');
+ $response->reloadComponent();
+ }
+}
diff --git a/library/AP/library/AP/FormAction/Application/Create.php b/library/AP/library/AP/FormAction/Application/Create.php
new file mode 100755
index 0000000..5a534e3
--- /dev/null
+++ b/library/AP/library/AP/FormAction/Application/Create.php
@@ -0,0 +1,18 @@
+getString('name');
+ $description = $params->has('description') ? $params->getString('description') : null;
+
+ $client = AP_Helper::getClient();
+ $client->application->create($name, $description);
+
+ $response->addMessage('Success: Application created.');
+ }
+}
diff --git a/library/AP/library/AP/FormAction/Application/Save.php b/library/AP/library/AP/FormAction/Application/Save.php
new file mode 100755
index 0000000..270c3ca
--- /dev/null
+++ b/library/AP/library/AP/FormAction/Application/Save.php
@@ -0,0 +1,19 @@
+getString('applicationId');
+ $name = $params->getString('name');
+ $description = $params->has('description') ? $params->getString('description') : null;
+
+ $client = AP_Helper::getClient();
+ $client->application->update($applicationId, $name, $description);
+
+ $response->addMessage('Success: Application saved.');
+ }
+}
diff --git a/library/AP/library/AP/FormAction/ChangePassword/Process.php b/library/AP/library/AP/FormAction/ChangePassword/Process.php
new file mode 100644
index 0000000..a740ddc
--- /dev/null
+++ b/library/AP/library/AP/FormAction/ChangePassword/Process.php
@@ -0,0 +1,29 @@
+getViewer(true);
+
+ if (!AP_App_Auth::checkLogin($user->getUsername(), $params->getString('old_password'))) {
+ $response->addError('Incorrect old password.', 'old_password');
+ } else {
+ if ($params->getString('new_password') != $params->getString('new_password_confirm')) {
+ $response->addError('Passwords do not match.', 'new_password');
+ }
+ }
+ }
+
+ protected function _process(CM_Params $params, CM_Response_View_Form $response, CM_Form_Abstract $form) {
+ /** @var AP_Model_User $user */
+ $user = $response->getViewer(true);
+ $user->setPassword($params->getString('new_password'));
+ $response->addMessage('Success: Password changed.');
+ $response->popinComponent();
+ }
+}
diff --git a/library/AP/library/AP/FormAction/Feed/Create.php b/library/AP/library/AP/FormAction/Feed/Create.php
new file mode 100755
index 0000000..159dd18
--- /dev/null
+++ b/library/AP/library/AP/FormAction/Feed/Create.php
@@ -0,0 +1,20 @@
+getString('applicationId');
+ $name = $params->getString('name');
+ $description = $params->has('description') ? $params->getString('description') : null;
+ $tagList = $params->has('tagList') ? $params->getArray('tagList') : null;
+
+ $client = AP_Helper::getClient();
+ $client->feed->create($applicationId, $name, $description, $tagList);
+
+ $response->addMessage('Success: New Feed has been added.');
+ }
+}
diff --git a/library/AP/library/AP/FormAction/Feed/Save.php b/library/AP/library/AP/FormAction/Feed/Save.php
new file mode 100755
index 0000000..111c46e
--- /dev/null
+++ b/library/AP/library/AP/FormAction/Feed/Save.php
@@ -0,0 +1,21 @@
+getString('applicationId');
+ $feedId = $params->getString('feedId');
+ $name = $params->getString('name');
+ $description = $params->has('description') ? $params->getString('description') : null;
+ $tagList = $params->has('tagList') ? $params->getArray('tagList') : null;
+
+ $client = AP_Helper::getClient();
+ $client->feed->update($applicationId, $feedId, $name, $description, $tagList);
+
+ $response->addMessage('Success: Feed saved.');
+ }
+}
diff --git a/library/AP/library/AP/FormAction/SignIn/Process.php b/library/AP/library/AP/FormAction/SignIn/Process.php
new file mode 100755
index 0000000..c64f698
--- /dev/null
+++ b/library/AP/library/AP/FormAction/SignIn/Process.php
@@ -0,0 +1,27 @@
+getRequest()->getIpBlocked()) {
+ $response->addError($response->getRender()->getTranslation('Your IP address is blocked.'));
+ }
+ }
+
+ protected function _process(CM_Params $params, CM_Response_View_Form $response, CM_Form_Abstract $form) {
+ try {
+ $user = AP_Model_User::authenticate($params->getString('login'), $params->getString('password'));
+ } catch (CM_Exception_AuthFailed $e) {
+ $response->addError($e->getMessagePublic($response->getRender()), 'password');
+ return;
+ }
+
+ $response->getRequest()->getSession()->setUser($user);
+
+ $response->reloadPage();
+ }
+}
diff --git a/library/AP/library/AP/FormAction/SignUp/Create.php b/library/AP/library/AP/FormAction/SignUp/Create.php
new file mode 100755
index 0000000..ab6bd6e
--- /dev/null
+++ b/library/AP/library/AP/FormAction/SignUp/Create.php
@@ -0,0 +1,34 @@
+getString('email'))) {
+ $response->addError($response->getRender()->getTranslation('This email address is already used.'), 'email');
+ }
+ if ($response->getRequest()->getIpBlocked()) {
+ $response->addError($response->getRender()->getTranslation('Your IP address is blocked.'));
+ }
+ }
+
+ protected function _process(CM_Params $params, CM_Response_View_Form $response, CM_Form_Abstract $form) {
+ $data = $params->getParamsDecoded();
+ $ip = $response->getRequest()->getIp();
+ if ($ip) {
+ $data['join_ip'] = $ip;
+ }
+ $data['site'] = $response->getSite();
+ $data['language'] = $response->getRequest()->getLanguage();
+
+ $user = AP_Model_User::createStatic($data);
+
+ $response->getRequest()->getSession()->setUser($user);
+ $response->getRequest()->getSession()->set('firstvisit', true);
+
+ $response->reloadPage();
+ }
+}
diff --git a/library/AP/library/AP/FormAction/Token/Create.php b/library/AP/library/AP/FormAction/Token/Create.php
new file mode 100755
index 0000000..464bce9
--- /dev/null
+++ b/library/AP/library/AP/FormAction/Token/Create.php
@@ -0,0 +1,18 @@
+getString('name');
+
+ $client = AP_Helper::getClient();
+ $client->token->create($name);
+
+ $response->addMessage('Success: New Token has been added.');
+ $response->reloadComponent();
+ }
+}
diff --git a/library/AP/library/AP/FormField/Username.js b/library/AP/library/AP/FormField/Username.js
new file mode 100644
index 0000000..5dc71cd
--- /dev/null
+++ b/library/AP/library/AP/FormField/Username.js
@@ -0,0 +1,14 @@
+/**
+ * @class AP_FormField_Username
+ * @extends CM_FormField_Text
+ */
+var AP_FormField_Username = CM_FormField_Text.extend({
+ _class: 'AP_FormField_Username',
+
+ ready: function() {
+ this.enableTriggerChangeOnInput();
+ this.on('change', function() {
+ this.validate();
+ }, this);
+ }
+});
diff --git a/library/AP/library/AP/FormField/Username.php b/library/AP/library/AP/FormField/Username.php
new file mode 100644
index 0000000..50fb14e
--- /dev/null
+++ b/library/AP/library/AP/FormField/Username.php
@@ -0,0 +1,32 @@
+_options['allowViewer'] = $this->_params->getBoolean('allowViewer', false);
+ $this->_params->set('lengthMax', 32);
+ parent::_initialize();
+ }
+
+ public function validate(CM_Frontend_Environment $environment, $userInput) {
+ $userInput = parent::validate($environment, $userInput);
+
+ if (!AP_Model_User::usernameIsValid($userInput)) {
+ throw new CM_Exception_FormFieldValidation('Username may only contain alphanumerical characters.');
+ }
+
+ /** @var AP_Model_User $viewer */
+ $viewer = $environment->getViewer();
+ $equalsViewer = $viewer && $this->_options['allowViewer'] && $userInput == $viewer->getUsername();
+ if (!$equalsViewer && AP_Model_User::findUsername($userInput)) {
+ throw new CM_Exception_FormFieldValidation('Username already taken');
+ }
+
+ $badwordList = new CM_Paging_ContentList_Badwords();
+ if ($badword = $badwordList->getMatch($userInput)) {
+ throw new CM_Exception_FormFieldValidation('Sorry, but we don\'t accept user names containing "{$badword}"', array('badword' => $badword));
+ }
+
+ return $userInput;
+ }
+}
diff --git a/library/AP/library/AP/Helper.php b/library/AP/library/AP/Helper.php
new file mode 100755
index 0000000..a089a50
--- /dev/null
+++ b/library/AP/library/AP/Helper.php
@@ -0,0 +1,40 @@
+application->get($applicationId);
+ }
+
+ /**
+ * @param string $applicationId
+ * @param string $feedId
+ * @return Feed
+ */
+ public static function getFeed($applicationId, $feedId) {
+ $client = static::getClient();
+ return $client->feed->get($applicationId, $feedId);
+ }
+}
diff --git a/library/AP/library/AP/Layout/Default.js b/library/AP/library/AP/Layout/Default.js
old mode 100644
new mode 100755
index 7ce6bdb..d9c3d30
--- a/library/AP/library/AP/Layout/Default.js
+++ b/library/AP/library/AP/Layout/Default.js
@@ -7,9 +7,78 @@ var AP_Layout_Default = CM_Layout_Abstract.extend({
/** @type String */
_class: 'AP_Layout_Default',
+ /** @type {OffCanvas|Null} */
+ _offCanvasNavigation: null,
+
+ /** @type {OffCanvas|Null} */
+ _offCanvasChat: null,
+
+ /** @type {Boolean} */
+ _shareVisible: false,
+
ready: function() {
- $('[data-toggle="offcanvas"]').click(function() {
- $('.row-offcanvas').toggleClass('active');
+ var self = this;
+
+ this._offCanvasNavigation = this.$('#navigation').offCanvas({wrap: '#body-container'}).data('offCanvas');
+ this._offCanvasChat = this.$('#chat').offCanvas({wrap: '#body-container'}).data('offCanvas');
+
+ var mediaQuerySmall = {
+ match: function() {
+ if (self._offCanvasNavigation) {
+ self._offCanvasNavigation.enable();
+ }
+ if (self._offCanvasChat) {
+ self._offCanvasChat.enable();
+ }
+ }
+ };
+
+ var mediaQueryMedium = {
+ match: function() {
+ if (self._offCanvasNavigation) {
+ self._offCanvasNavigation.disable();
+ }
+ if (self._offCanvasChat) {
+ self._offCanvasChat.disable();
+ }
+ }
+ };
+
+ var mediaQueryLarge = {
+ match: function() {
+ if (self._offCanvasNavigation) {
+ self._offCanvasNavigation.disable();
+ }
+ if (self._offCanvasChat) {
+ self._offCanvasChat.disable();
+ }
+ }
+ };
+
+ enquire.register('(max-width: 994px)', mediaQuerySmall);
+ enquire.register('(min-width: 995px) and (max-width: 1399px)', mediaQueryMedium);
+ enquire.register('(min-width: 1400px)', mediaQueryLarge);
+
+ this.on('destruct', function() {
+ enquire.unregister('(max-width: 994px)', mediaQuerySmall);
+ enquire.unregister('(min-width: 995px) and (max-width: 1399px)', mediaQueryMedium);
+ enquire.unregister('(min-width: 1400px)', mediaQueryLarge);
});
+
+ this.on('navigate', function() {
+ this.hideNavigation();
+ }, this);
+ },
+
+ showNavigation: function() {
+ if (this._offCanvasNavigation) {
+ this._offCanvasNavigation.open('100%', this.$('#navigation').outerHeight(true));
+ }
+ },
+
+ hideNavigation: function() {
+ if (this._offCanvasNavigation) {
+ this._offCanvasNavigation.close();
+ }
}
});
diff --git a/library/AP/library/AP/Layout/Default.php b/library/AP/library/AP/Layout/Default.php
old mode 100644
new mode 100755
diff --git a/library/AP/library/AP/Layout/Index.js b/library/AP/library/AP/Layout/Index.js
new file mode 100644
index 0000000..18b3817
--- /dev/null
+++ b/library/AP/library/AP/Layout/Index.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Layout_Index
+ * @extends AP_Layout_Default
+ */
+var AP_Layout_Index = AP_Layout_Default.extend({
+
+ /** @type String */
+ _class: 'AP_Layout_Index'
+});
diff --git a/library/AP/library/AP/Layout/Index.php b/library/AP/library/AP/Layout/Index.php
new file mode 100644
index 0000000..5d73026
--- /dev/null
+++ b/library/AP/library/AP/Layout/Index.php
@@ -0,0 +1,5 @@
+ 'About', 'page' => 'AP_Page_About'),
+ array('label' => 'Contact', 'page' => 'AP_Page_Contact'),
+ array('label' => 'Feedback', 'page' => 'AP_Page_Feedback'),
+ array('label' => 'Terms', 'page' => 'AP_Page_Terms'),
+ ));
+ }
+}
diff --git a/library/AP/library/AP/Menu/Account.php b/library/AP/library/AP/Menu/Account.php
old mode 100644
new mode 100755
index 48961f4..df8cb5d
--- a/library/AP/library/AP/Menu/Account.php
+++ b/library/AP/library/AP/Menu/Account.php
@@ -4,8 +4,7 @@ class AP_Menu_Account extends CM_Menu {
public function __construct() {
parent::__construct(array(
- array('label' => 'Settings', 'page' => 'AP_Page_Settings'),
- array('label' => 'Profile', 'page' => 'AP_Page_Profile'),
+ array('label' => 'Settings', 'page' => 'AP_Page_Settings', 'icon' => 'gear'),
));
}
}
diff --git a/library/AP/library/AP/Menu/Browse.php b/library/AP/library/AP/Menu/Browse.php
new file mode 100755
index 0000000..e55f79b
--- /dev/null
+++ b/library/AP/library/AP/Menu/Browse.php
@@ -0,0 +1,17 @@
+ 'Overview', 'page' => 'AP_Page_Overview', 'icon' => 'home'),
+ array('label' => 'Application', 'page' => 'AP_Page_ApplicationOverview', 'icon' => 'overview', 'submenu' => array(
+ array('label' => 'Application', 'page' => 'AP_Page_Application', 'viewable' => false),
+ )),
+ array('label' => 'Feed', 'page' => 'AP_Page_FeedOverview', 'icon' => 'feed', 'submenu' => array(
+ array('label' => 'Feed', 'page' => 'AP_Page_Feed', 'viewable' => false),
+ )),
+ array('label' => 'Account', 'page' => 'AP_Page_Account', 'icon' => 'friends'),
+ ));
+ }
+}
diff --git a/library/AP/library/AP/Menu/Main.php b/library/AP/library/AP/Menu/Main.php
deleted file mode 100644
index 3adbc32..0000000
--- a/library/AP/library/AP/Menu/Main.php
+++ /dev/null
@@ -1,12 +0,0 @@
- 'Overview', 'page' => 'AP_Page_Index'),
- array('label' => 'Application', 'page' => 'AP_Page_Application'),
- array('label' => 'Feed', 'page' => 'AP_Page_Feed'),
- ));
- }
-}
diff --git a/library/AP/library/AP/Model/User.php b/library/AP/library/AP/Model/User.php
new file mode 100755
index 0000000..aeec3ba
--- /dev/null
+++ b/library/AP/library/AP/Model/User.php
@@ -0,0 +1,169 @@
+_get('email');
+ }
+
+ /**
+ * @param string $email
+ * @return AP_Model_User
+ */
+ public function setEmail($email) {
+ CM_Db_Db::update('ap_user', array('email' => $email), array('userId' => $this->getId()));
+ return $this->_change();
+ }
+
+ /**
+ * @return string
+ */
+ public function getUsername() {
+ return $this->_get('username');
+ }
+
+ /**
+ * @param string $username
+ * @return AP_Model_User
+ */
+ public function setUsername($username) {
+ CM_Db_Db::update('ap_user', array('username' => $username), array('userId' => $this->getId()));
+ return $this->_change();
+ }
+
+ /**
+ * @param string $password
+ * @return AP_Model_User
+ */
+ public function setPassword($password) {
+ $hash = AP_App_Auth::generateHashUserPassword($this, $password);
+ CM_Db_Db::update('ap_user', array('password' => $hash), array('userId' => $this->getId()));
+ return $this->_change();
+ }
+
+
+
+ protected function _loadData() {
+ $return = CM_Db_Db::exec("SELECT `main`.*, `secondary`.*, `online`.`userId` AS `online`, `online`.`visible`
+ FROM `cm_user` AS `main`
+ JOIN `ap_user` AS `secondary` USING (`userId`)
+ LEFT JOIN `cm_user_online` AS `online` USING(`userId`)
+ WHERE `main`.`userId`=?", array($this->getId()))->fetch();
+ return $return;
+ }
+
+ protected function _onDelete() {
+ CM_Db_Db::delete('ap_user', array('userId' => $this->getId()));
+ parent::_onDelete();
+ }
+
+ /**
+ * @param string $login
+ * @param string $password
+ * @return AP_Model_User
+ * @throws CM_Exception_AuthFailed
+ */
+ public static function authenticate($login, $password) {
+ if (!$login || !$password) {
+ throw new CM_Exception_AuthFailed('Username and password required', null, array('messagePublic' => 'Username or Password is empty'));
+ }
+ $user = AP_App_Auth::checkLogin($login, $password);
+ if (!$user) {
+ throw new CM_Exception_AuthFailed('Authentication failed', null, array('messagePublic' => 'Password and Username do not match'));
+ }
+
+ if (isset($_SERVER['HTTP_USER_AGENT'])) {
+ $user->getUseragents()->add($_SERVER['HTTP_USER_AGENT']);
+ }
+ return $user;
+ }
+
+ /**
+ * @param string $username
+ * @return bool
+ */
+ public static function usernameIsValid($username) {
+ return (bool) preg_match("/^[" . self::USERNAME_CHARACTERS . "]*$/", $username);
+ }
+
+ /**
+ * @param string $username
+ * @return AP_Model_User|null
+ */
+ public static function findUsername($username) {
+ $cacheKey = self::_getUsernameCacheKey($username);
+ $cache = CM_Cache_Shared::getInstance();
+ if (($id = $cache->get($cacheKey)) === false) {
+ $id = CM_Db_Db::select('ap_user', 'userId', array('username' => $username))->fetchColumn();
+ if (!$id) {
+ return null;
+ }
+ $cache->set($cacheKey, (int) $id);
+ }
+ return new self($id);
+ }
+
+ /**
+ * @param string $email
+ * @return AP_Model_User|null
+ */
+ public static function findEmail($email) {
+ $id = CM_Db_Db::select('ap_user', 'userId', array('email' => $email))->fetchColumn();
+ if (!$id) {
+ return null;
+ }
+ return new self($id);
+ }
+
+
+ /**
+ * @param array $data
+ * @throws CM_Exception|Exception
+ * @return AP_Model_User
+ */
+ public static function _createStatic(array $data) {
+ $site = null;
+ if (isset($data['site'])) {
+ /** @var CM_Site_Abstract $site */
+ $site = $data['site'];
+ }
+ $language = null;
+ if (isset($data['language'])) {
+ /** @var CM_Model_Language $language */
+ $language = $data['language'];
+ }
+ $username = (string) $data['username'];
+ $email = (string) $data['email'];
+ $password = (string) $data['password'];
+ $user = CM_Model_User::createStatic(array('site' => $site, 'language' => $language));
+ $userId = $user->getId();
+ $hash = AP_App_Auth::generateHashUserPassword($user, $password);
+ $values = array('userId' => $userId,
+ 'username' => $username,
+ 'email' => $email,
+ 'password' => $hash,
+ );
+ try {
+ CM_Db_Db::insert('ap_user', $values);
+ } catch (CM_Exception $e) {
+ CM_Db_Db::delete('cm_user', array('userId' => $userId));
+ throw $e;
+ }
+
+ return new self($userId);
+ }
+
+ /**
+ * @param string $username
+ * @return string
+ */
+ private static function _getUsernameCacheKey($username) {
+ return AP_CacheConst::User . '_username:' . $username;
+ }
+}
diff --git a/library/AP/library/AP/Page/About.js b/library/AP/library/AP/Page/About.js
new file mode 100755
index 0000000..3dc52c3
--- /dev/null
+++ b/library/AP/library/AP/Page/About.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Page_About
+ * @extends CM_Page_Abstract
+ */
+var AP_Page_About = CM_Page_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Page_About'
+});
diff --git a/library/AP/library/AP/Page/About.php b/library/AP/library/AP/Page/About.php
new file mode 100755
index 0000000..317b2c7
--- /dev/null
+++ b/library/AP/library/AP/Page/About.php
@@ -0,0 +1,5 @@
+getParams()->getString('application');
+ $viewResponse->set('application', $application);
+ }
}
diff --git a/library/AP/library/AP/Page/ApplicationOverview.js b/library/AP/library/AP/Page/ApplicationOverview.js
new file mode 100755
index 0000000..a07d3ef
--- /dev/null
+++ b/library/AP/library/AP/Page/ApplicationOverview.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Page_ApplicationOverview
+ * @extends CM_Page_Abstract
+ */
+var AP_Page_ApplicationOverview = CM_Page_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Page_ApplicationOverview'
+});
diff --git a/library/AP/library/AP/Page/ApplicationOverview.php b/library/AP/library/AP/Page/ApplicationOverview.php
new file mode 100755
index 0000000..e55b14c
--- /dev/null
+++ b/library/AP/library/AP/Page/ApplicationOverview.php
@@ -0,0 +1,5 @@
+getParams()->getString('application');
+ $feed = $this->getParams()->getString('feed');
+
+ $viewResponse->set('application', $application);
+ $viewResponse->set('feed', $feed);
+ }
}
diff --git a/library/AP/library/AP/Page/FeedOverview.js b/library/AP/library/AP/Page/FeedOverview.js
new file mode 100755
index 0000000..aa36576
--- /dev/null
+++ b/library/AP/library/AP/Page/FeedOverview.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Page_FeedOverview
+ * @extends CM_Page_Abstract
+ */
+var AP_Page_FeedOverview = CM_Page_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Page_FeedOverview'
+});
diff --git a/library/AP/library/AP/Page/FeedOverview.php b/library/AP/library/AP/Page/FeedOverview.php
new file mode 100755
index 0000000..e9b4c73
--- /dev/null
+++ b/library/AP/library/AP/Page/FeedOverview.php
@@ -0,0 +1,5 @@
+getViewer()) {
+ $response->redirect('AP_Page_Overview');
+ return;
+ }
+ }
+
+ public function getLayout(CM_Frontend_Environment $environment, $layoutName = null) {
+ if (null === $layoutName) {
+ $layoutName = 'Index';
+ }
+ return parent::getLayout($environment, $layoutName);
+ }
}
diff --git a/library/AP/library/AP/Page/Overview.js b/library/AP/library/AP/Page/Overview.js
new file mode 100755
index 0000000..82b3c6b
--- /dev/null
+++ b/library/AP/library/AP/Page/Overview.js
@@ -0,0 +1,9 @@
+/**
+ * @class AP_Page_Overview
+ * @extends CM_Page_Abstract
+ */
+var AP_Page_Overview = CM_Page_Abstract.extend({
+
+ /** @type String */
+ _class: 'AP_Page_Overview'
+});
diff --git a/library/AP/library/AP/Page/Overview.php b/library/AP/library/AP/Page/Overview.php
new file mode 100755
index 0000000..637ade7
--- /dev/null
+++ b/library/AP/library/AP/Page/Overview.php
@@ -0,0 +1,5 @@
+_setModule('AP');
+ }
}
diff --git a/library/AP/library/AP/Site/AdminPanel.php b/library/AP/library/AP/Site/AdminPanel.php
old mode 100644
new mode 100755
index 193d59f..4b75685
--- a/library/AP/library/AP/Site/AdminPanel.php
+++ b/library/AP/library/AP/Site/AdminPanel.php
@@ -2,15 +2,11 @@
class AP_Site_AdminPanel extends AP_Site_Abstract {
- public function __construct() {
- parent::__construct();
- $this->_setModule('AP');
- }
-
public function getMenus() {
return array(
- 'main' => new AP_Menu_Main(),
+ 'browse' => new AP_Menu_Browse(),
'account' => new AP_Menu_Account(),
+ 'about' => new AP_Menu_About(),
);
}
}
diff --git a/library/AP/library/AP/SmartyPlugins/block.box.php b/library/AP/library/AP/SmartyPlugins/block.box.php
new file mode 100644
index 0000000..a6dd506
--- /dev/null
+++ b/library/AP/library/AP/SmartyPlugins/block.box.php
@@ -0,0 +1,30 @@
+' . CM_Util::htmlspecialchars($params['title']) . '';
+ }
+ $template->assign('box-header', $header);
+ $template->assign('box-footer', null);
+ return '';
+ } else {
+ $class = isset($params['class']) ? $params['class'] : null;
+
+ $header = $template->getVariable('box-header');
+ $footer = $template->getVariable('box-footer');
+
+
+ $output = '' + msg + '
';
+ if ($header->value) {
+ $output .= '
';
+ return $output;
+ }
+}
diff --git a/library/AP/library/AP/SmartyPlugins/block.box_footer.php b/library/AP/library/AP/SmartyPlugins/block.box_footer.php
new file mode 100644
index 0000000..9057d66
--- /dev/null
+++ b/library/AP/library/AP/SmartyPlugins/block.box_footer.php
@@ -0,0 +1,8 @@
+assign('box-footer', $content);
+ }
+}
diff --git a/library/AP/library/AP/SmartyPlugins/block.box_header.php b/library/AP/library/AP/SmartyPlugins/block.box_header.php
new file mode 100644
index 0000000..1bfa5bb
--- /dev/null
+++ b/library/AP/library/AP/SmartyPlugins/block.box_header.php
@@ -0,0 +1,8 @@
+assign('box-header', $content);
+ }
+}
diff --git a/library/AP/resources/config/default.php b/library/AP/resources/config/default.php
old mode 100644
new mode 100755
index e849e8a..d8518c5
--- a/library/AP/resources/config/default.php
+++ b/library/AP/resources/config/default.php
@@ -2,11 +2,15 @@
return function (CM_Config_Node $config) {
+ $config->installationName = '';
+
+ $config->CM_Model_User->class = 'AP_Model_User';
+
$config->CM_Response_Page->catch = array(
- 'CM_Exception_Nonexistent' => '/error/not-found',
- 'CM_Exception_InvalidParam' => '/error/not-found',
- 'CM_Exception_AuthRequired' => '/error/auth-required',
- 'CM_Exception_NotAllowed' => '/error/not-allowed',
+// 'CM_Exception_Nonexistent' => '/error/not-found',
+// 'CM_Exception_InvalidParam' => '/error/not-found',
+// 'CM_Exception_AuthRequired' => '/error/auth-required',
+// 'CM_Exception_NotAllowed' => '/error/not-allowed',
);
$config->CM_Response_View_Abstract->catch = array(
diff --git a/library/AP/resources/db/setup.php b/library/AP/resources/db/setup.php
new file mode 100755
index 0000000..e1a4d15
--- /dev/null
+++ b/library/AP/resources/db/setup.php
@@ -0,0 +1,7 @@
+ 'admin',
+ 'email' => 'admin@example.com',
+ 'password' => 'admin',
+]);
diff --git a/library/AP/resources/db/structure.sql b/library/AP/resources/db/structure.sql
old mode 100644
new mode 100755
index f3075d3..e6c64dc
--- a/library/AP/resources/db/structure.sql
+++ b/library/AP/resources/db/structure.sql
@@ -1,2 +1,14 @@
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
/*!40101 SET NAMES utf8 */;
+DROP TABLE IF EXISTS `ap_user`;
+
+
+CREATE TABLE `ap_user` (
+ `userId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `email` varchar(128) NOT NULL DEFAULT '',
+ `username` varchar(32) NOT NULL DEFAULT '',
+ `password` char(64) DEFAULT NULL,
+ PRIMARY KEY (`userId`),
+ UNIQUE KEY `email` (`email`),
+ UNIQUE KEY `username` (`username`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/library/AP/resources/db/update/316.php b/library/AP/resources/db/update/316.php
new file mode 100755
index 0000000..b0ea264
--- /dev/null
+++ b/library/AP/resources/db/update/316.php
@@ -0,0 +1,5 @@
+
- ' . $header . '
';
+ }
+ $output .= '' . $content . '
';
+ if ($footer->value) {
+ $output .= '';
+ }
+ $output .= 'We are currently undergoing maintenance
Sorry for the inconvenience. We hope to be back soon!
diff --git a/public/static/css/library/icon.less b/public/static/css/library/icon.less new file mode 100755 index 0000000..fec4629 --- /dev/null +++ b/public/static/css/library/icon.less @@ -0,0 +1,315 @@ +/* + Icon Font: icon-webfont +*/ + +@font-face { + font-family: "icon-webfont"; + src: url(urlFont("icon-webfont.eot") + ""); + src: url(urlFont("icon-webfont.eot") + "?#iefix") format("embedded-opentype"), + url(urlFont("icon-webfont.woff") + "") format("woff"), + url(urlFont("icon-webfont.ttf") + "") format("truetype"), + url(urlFont("icon-webfont.svg") + "#icon-webfont") format("svg"); + font-weight: normal; + font-style: normal; +} + +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: "icon-webfont"; + src: url(urlFont("icon-webfont.svg") + "#icon-webfont") format("svg"); + } +} + +[data-icon]:before { content: attr(data-icon); } + +[data-icon]:before, +.icon-add:before, +.icon-animation:before, +.icon-arrow-down:before, +.icon-arrow-first:before, +.icon-arrow-last:before, +.icon-arrow-left:before, +.icon-arrow-right:before, +.icon-arrow-up:before, +.icon-audio:before, +.icon-audio-mute:before, +.icon-award:before, +.icon-blog:before, +.icon-bold:before, +.icon-bomb:before, +.icon-bookmark:before, +.icon-calendar:before, +.icon-cam:before, +.icon-cam-off:before, +.icon-categories:before, +.icon-chat:before, +.icon-chat-cam:before, +.icon-check:before, +.icon-check-false:before, +.icon-clapper:before, +.icon-close:before, +.icon-close2:before, +.icon-coin:before, +.icon-comment:before, +.icon-cross:before, +.icon-crosshair:before, +.icon-cupid:before, +.icon-debug:before, +.icon-delete:before, +.icon-delete-confirm:before, +.icon-dice:before, +.icon-disable:before, +.icon-dot:before, +.icon-download:before, +.icon-edit:before, +.icon-emoticon:before, +.icon-enter:before, +.icon-expand:before, +.icon-external:before, +.icon-eye:before, +.icon-feed:before, +.icon-friends:before, +.icon-game:before, +.icon-gamescore:before, +.icon-gear:before, +.icon-gift:before, +.icon-graph:before, +.icon-heart:before, +.icon-home:before, +.icon-hot:before, +.icon-image:before, +.icon-info:before, +.icon-italic:before, +.icon-locked:before, +.icon-logout:before, +.icon-mailbox:before, +.icon-mailbox-inbox:before, +.icon-mailbox-read:before, +.icon-mailbox-sent:before, +.icon-mailbox-unread:before, +.icon-map:before, +.icon-markdown:before, +.icon-member-add:before, +.icon-member-delete:before, +.icon-menu:before, +.icon-menu-dropdown:before, +.icon-menu-micro:before, +.icon-menu-profile:before, +.icon-mic:before, +.icon-mic-off:before, +.icon-minimize:before, +.icon-minus:before, +.icon-mobile:before, +.icon-moderator:before, +.icon-money:before, +.icon-music:before, +.icon-nav-left:before, +.icon-nav-right:before, +.icon-new:before, +.icon-notification:before, +.icon-online:before, +.icon-overview:before, +.icon-pause:before, +.icon-photo:before, +.icon-pin:before, +.icon-pin-add:before, +.icon-play:before, +.icon-play2:before, +.icon-playboy:before, +.icon-plus:before, +.icon-pluslove:before, +.icon-popin:before, +.icon-popout:before, +.icon-premium:before, +.icon-profile:before, +.icon-puzzle:before, +.icon-question:before, +.icon-quotation:before, +.icon-redirect:before, +.icon-reload:before, +.icon-report:before, +.icon-reputation:before, +.icon-resize-full:before, +.icon-resize-small:before, +.icon-roller:before, +.icon-rotate-ccw:before, +.icon-rotate-cw:before, +.icon-search:before, +.icon-select:before, +.icon-send:before, +.icon-sex1:before, +.icon-sex2:before, +.icon-sex4:before, +.icon-share:before, +.icon-standby:before, +.icon-star:before, +.icon-stats:before, +.icon-stats-up:before, +.icon-stop:before, +.icon-switch:before, +.icon-tag:before, +.icon-talk:before, +.icon-talk-off:before, +.icon-test:before, +.icon-thumbs-down:before, +.icon-thumbs-up:before, +.icon-time:before, +.icon-trophy:before, +.icon-underline:before, +.icon-upload:before, +.icon-verified:before, +.icon-video:before, +.icon-warning:before, +.icon-webcam:before { + display: inline-block; + font-family: "icon-webfont"; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + text-decoration: inherit; + text-rendering: optimizeLegibility; + text-transform: none; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-smoothing: antialiased; +} + +.icon-add:before { content: "\f100"; } +.icon-animation:before { content: "\f101"; } +.icon-arrow-down:before { content: "\f102"; } +.icon-arrow-first:before { content: "\f103"; } +.icon-arrow-last:before { content: "\f104"; } +.icon-arrow-left:before { content: "\f105"; } +.icon-arrow-right:before { content: "\f106"; } +.icon-arrow-up:before { content: "\f107"; } +.icon-audio:before { content: "\f108"; } +.icon-audio-mute:before { content: "\f109"; } +.icon-award:before { content: "\f10a"; } +.icon-blog:before { content: "\f10b"; } +.icon-bold:before { content: "\f10c"; } +.icon-bomb:before { content: "\f10d"; } +.icon-bookmark:before { content: "\f10e"; } +.icon-calendar:before { content: "\f10f"; } +.icon-cam:before { content: "\f110"; } +.icon-cam-off:before { content: "\f111"; } +.icon-categories:before { content: "\f112"; } +.icon-chat:before { content: "\f113"; } +.icon-chat-cam:before { content: "\f114"; } +.icon-check:before { content: "\f115"; } +.icon-check-false:before { content: "\f116"; } +.icon-clapper:before { content: "\f117"; } +.icon-close:before { content: "\f118"; } +.icon-close2:before { content: "\f119"; } +.icon-coin:before { content: "\f11a"; } +.icon-comment:before { content: "\f11b"; } +.icon-cross:before { content: "\f11c"; } +.icon-crosshair:before { content: "\f11d"; } +.icon-cupid:before { content: "\f11e"; } +.icon-debug:before { content: "\f11f"; } +.icon-delete:before { content: "\f120"; } +.icon-delete-confirm:before { content: "\f121"; } +.icon-dice:before { content: "\f122"; } +.icon-disable:before { content: "\f123"; } +.icon-dot:before { content: "\f124"; } +.icon-download:before { content: "\f125"; } +.icon-edit:before { content: "\f126"; } +.icon-emoticon:before { content: "\f127"; } +.icon-enter:before { content: "\f128"; } +.icon-expand:before { content: "\f12a"; } +.icon-external:before { content: "\f12b"; } +.icon-eye:before { content: "\f12c"; } +.icon-feed:before { content: "\f12d"; } +.icon-friends:before { content: "\f12e"; } +.icon-game:before { content: "\f12f"; } +.icon-gamescore:before { content: "\f130"; } +.icon-gear:before { content: "\f131"; } +.icon-gift:before { content: "\f132"; } +.icon-graph:before { content: "\f133"; } +.icon-heart:before { content: "\f134"; } +.icon-home:before { content: "\f135"; } +.icon-hot:before { content: "\f136"; } +.icon-image:before { content: "\f137"; } +.icon-info:before { content: "\f138"; } +.icon-italic:before { content: "\f139"; } +.icon-locked:before { content: "\f13a"; } +.icon-logout:before { content: "\f13b"; } +.icon-mailbox:before { content: "\f13c"; } +.icon-mailbox-inbox:before { content: "\f13d"; } +.icon-mailbox-read:before { content: "\f13e"; } +.icon-mailbox-sent:before { content: "\f13f"; } +.icon-mailbox-unread:before { content: "\f140"; } +.icon-map:before { content: "\f141"; } +.icon-markdown:before { content: "\f142"; } +.icon-member-add:before { content: "\f143"; } +.icon-member-delete:before { content: "\f144"; } +.icon-menu:before { content: "\f145"; } +.icon-menu-dropdown:before { content: "\f146"; } +.icon-menu-micro:before { content: "\f147"; } +.icon-menu-profile:before { content: "\f148"; } +.icon-mic:before { content: "\f149"; } +.icon-mic-off:before { content: "\f14a"; } +.icon-minimize:before { content: "\f14b"; } +.icon-minus:before { content: "\f14c"; } +.icon-mobile:before { content: "\f14d"; } +.icon-moderator:before { content: "\f14e"; } +.icon-money:before { content: "\f14f"; } +.icon-music:before { content: "\f150"; } +.icon-nav-left:before { content: "\f151"; } +.icon-nav-right:before { content: "\f152"; } +.icon-new:before { content: "\f153"; } +.icon-notification:before { content: "\f154"; } +.icon-online:before { content: "\f155"; } +.icon-overview:before { content: "\f156"; } +.icon-pause:before { content: "\f157"; } +.icon-photo:before { content: "\f158"; } +.icon-pin:before { content: "\f159"; } +.icon-pin-add:before { content: "\f15a"; } +.icon-play:before { content: "\f15b"; } +.icon-play2:before { content: "\f15c"; } +.icon-playboy:before { content: "\f15d"; } +.icon-plus:before { content: "\f15e"; } +.icon-pluslove:before { content: "\f15f"; } +.icon-popin:before { content: "\f160"; } +.icon-popout:before { content: "\f161"; } +.icon-premium:before { content: "\f162"; } +.icon-profile:before { content: "\f163"; } +.icon-puzzle:before { content: "\f164"; } +.icon-question:before { content: "\f165"; } +.icon-quotation:before { content: "\f166"; } +.icon-redirect:before { content: "\f167"; } +.icon-reload:before { content: "\f168"; } +.icon-report:before { content: "\f169"; } +.icon-reputation:before { content: "\f16a"; } +.icon-resize-full:before { content: "\f16b"; } +.icon-resize-small:before { content: "\f16c"; } +.icon-roller:before { content: "\f16d"; } +.icon-rotate-ccw:before { content: "\f16e"; } +.icon-rotate-cw:before { content: "\f16f"; } +.icon-search:before { content: "\f170"; } +.icon-select:before { content: "\f171"; } +.icon-send:before { content: "\f18d"; } +.icon-sex1:before { content: "\f172"; } +.icon-sex2:before { content: "\f173"; } +.icon-sex4:before { content: "\f174"; } +.icon-share:before { content: "\f175"; } +.icon-standby:before { content: "\f176"; } +.icon-star:before { content: "\f177"; } +.icon-stats:before { content: "\f178"; } +.icon-stats-up:before { content: "\f179"; } +.icon-stop:before { content: "\f17a"; } +.icon-switch:before { content: "\f17b"; } +.icon-tag:before { content: "\f17c"; } +.icon-talk:before { content: "\f17d"; } +.icon-talk-off:before { content: "\f17e"; } +.icon-test:before { content: "\f17f"; } +.icon-thumbs-down:before { content: "\f180"; } +.icon-thumbs-up:before { content: "\f181"; } +.icon-time:before { content: "\f182"; } +.icon-trophy:before { content: "\f183"; } +.icon-underline:before { content: "\f184"; } +.icon-upload:before { content: "\f185"; } +.icon-verified:before { content: "\f186"; } +.icon-video:before { content: "\f187"; } +.icon-warning:before { content: "\f18c"; } +.icon-webcam:before { content: "\f189"; } diff --git a/public/static/font/icon-webfont.eot b/public/static/font/icon-webfont.eot new file mode 100755 index 0000000..99d1766 Binary files /dev/null and b/public/static/font/icon-webfont.eot differ diff --git a/public/static/font/icon-webfont.svg b/public/static/font/icon-webfont.svg new file mode 100755 index 0000000..b97046a --- /dev/null +++ b/public/static/font/icon-webfont.svg @@ -0,0 +1,688 @@ + + + + diff --git a/public/static/font/icon-webfont.ttf b/public/static/font/icon-webfont.ttf new file mode 100755 index 0000000..9b34d31 Binary files /dev/null and b/public/static/font/icon-webfont.ttf differ diff --git a/public/static/font/icon-webfont.woff b/public/static/font/icon-webfont.woff new file mode 100755 index 0000000..559951e Binary files /dev/null and b/public/static/font/icon-webfont.woff differ diff --git a/public/static/font/lsans_0-webfont.eot b/public/static/font/lsans_0-webfont.eot new file mode 100755 index 0000000..e3f7adb Binary files /dev/null and b/public/static/font/lsans_0-webfont.eot differ diff --git a/public/static/font/lsans_0-webfont.svg b/public/static/font/lsans_0-webfont.svg new file mode 100755 index 0000000..7cd4e88 --- /dev/null +++ b/public/static/font/lsans_0-webfont.svg @@ -0,0 +1,237 @@ + + + \ No newline at end of file diff --git a/public/static/font/lsans_0-webfont.ttf b/public/static/font/lsans_0-webfont.ttf new file mode 100755 index 0000000..4e2264b Binary files /dev/null and b/public/static/font/lsans_0-webfont.ttf differ diff --git a/public/static/font/lsans_0-webfont.woff b/public/static/font/lsans_0-webfont.woff new file mode 100755 index 0000000..0de09cf Binary files /dev/null and b/public/static/font/lsans_0-webfont.woff differ diff --git a/public/static/font/lsansd_0.eot b/public/static/font/lsansd_0.eot new file mode 100755 index 0000000..a2dfe7b Binary files /dev/null and b/public/static/font/lsansd_0.eot differ diff --git a/public/static/font/lsansd_0.svg b/public/static/font/lsansd_0.svg new file mode 100755 index 0000000..c4155df --- /dev/null +++ b/public/static/font/lsansd_0.svg @@ -0,0 +1,608 @@ + + + diff --git a/public/static/font/lsansd_0.ttf b/public/static/font/lsansd_0.ttf new file mode 100755 index 0000000..1486f92 Binary files /dev/null and b/public/static/font/lsansd_0.ttf differ diff --git a/public/static/font/lsansd_0.woff b/public/static/font/lsansd_0.woff new file mode 100755 index 0000000..2c54412 Binary files /dev/null and b/public/static/font/lsansd_0.woff differ diff --git a/public/static/font/trebuc.eot b/public/static/font/trebuc.eot new file mode 100755 index 0000000..584392e Binary files /dev/null and b/public/static/font/trebuc.eot differ diff --git a/public/static/font/trebuc.ttf b/public/static/font/trebuc.ttf new file mode 100755 index 0000000..b3bd292 Binary files /dev/null and b/public/static/font/trebuc.ttf differ diff --git a/public/static/font/trebuc.woff b/public/static/font/trebuc.woff new file mode 100755 index 0000000..6ed2301 Binary files /dev/null and b/public/static/font/trebuc.woff differ diff --git a/public/static/img/gifts/34.jpg b/public/static/img/gifts/34.jpg new file mode 100755 index 0000000..24b79e4 Binary files /dev/null and b/public/static/img/gifts/34.jpg differ diff --git a/public/static/img/gifts/35.jpg b/public/static/img/gifts/35.jpg new file mode 100755 index 0000000..8ad2364 Binary files /dev/null and b/public/static/img/gifts/35.jpg differ diff --git a/public/static/img/gifts/36.jpg b/public/static/img/gifts/36.jpg new file mode 100755 index 0000000..e9b7807 Binary files /dev/null and b/public/static/img/gifts/36.jpg differ diff --git a/public/static/img/gifts/37.jpg b/public/static/img/gifts/37.jpg new file mode 100755 index 0000000..a3d6bb7 Binary files /dev/null and b/public/static/img/gifts/37.jpg differ diff --git a/public/static/img/gifts/38.jpg b/public/static/img/gifts/38.jpg new file mode 100755 index 0000000..9618d98 Binary files /dev/null and b/public/static/img/gifts/38.jpg differ diff --git a/public/static/img/gifts/39.jpg b/public/static/img/gifts/39.jpg new file mode 100755 index 0000000..850a5df Binary files /dev/null and b/public/static/img/gifts/39.jpg differ diff --git a/puppet/.gitignore b/puppet/.gitignore old mode 100644 new mode 100755 diff --git a/puppet/.librarian/puppet/config b/puppet/.librarian/puppet/config old mode 100644 new mode 100755 diff --git a/puppet/Puppetfile b/puppet/Puppetfile old mode 100644 new mode 100755 diff --git a/puppet/manifests/default.pp b/puppet/manifests/default.pp old mode 100644 new mode 100755 diff --git a/resources/config/default.php b/resources/config/default.php old mode 100644 new mode 100755 index 6d3222e..9fe412b --- a/resources/config/default.php +++ b/resources/config/default.php @@ -3,5 +3,6 @@ return function (CM_Config_Node $config) { $config->CM_Site_Abstract->class = 'AP_Site_AdminPanel'; + $config->AP_Site_AdminPanel->name = 'Feedlabs | Admin Panel'; }; diff --git a/resources/config/internal.php b/resources/config/internal.php old mode 100644 new mode 100755 index a7821ad..f6e4a0f --- a/resources/config/internal.php +++ b/resources/config/internal.php @@ -29,6 +29,7 @@ $config->CM_Model_Abstract->types[29] = 'CM_Model_Location_State'; $config->CM_Model_Abstract->types[30] = 'CM_Model_Location_Zip'; $config->CM_Model_Abstract->types[36] = 'CM_Model_LanguageKey'; + $config->CM_Model_Abstract->types[38] = 'AP_Model_User'; $config->CM_Paging_ContentList_Abstract->types = array(); $config->CM_Paging_ContentList_Abstract->types[19] = 'CM_Paging_ContentList_Badwords'; @@ -41,7 +42,7 @@ $config->CM_Paging_Log_Abstract->types[24] = 'CM_Paging_Log_Warn'; $config->CM_Site_Abstract->types = array(); - $config->CM_Site_Abstract->types[37] = 'AP_Site_AdminPanel'; + $config->CM_Site_Abstract->types[39] = 'AP_Site_AdminPanel'; $config->CM_Stream_Adapter_Abstract->types = array(); $config->CM_Stream_Adapter_Abstract->types[25] = 'CM_Stream_Adapter_Message_SocketRedis'; @@ -78,9 +79,10 @@ $config->CM_Model_Location_State->type = 29; $config->CM_Model_Location_Zip->type = 30; $config->CM_Model_LanguageKey->type = 36; - $config->AP_Site_AdminPanel->type = 37; + $config->AP_Model_User->type = 38; + $config->AP_Site_AdminPanel->type = 39; - $config->CM_Class_Abstract->typesMaxValue = 37; + $config->CM_Class_Abstract->typesMaxValue = 39; $config->CM_Action_Abstract->verbs = array(); $config->CM_Action_Abstract->verbs[CM_Action_Abstract::CREATE] = 1; diff --git a/resources/config/js/internal.js b/resources/config/js/internal.js old mode 100644 new mode 100755 index 71fcd5e..3b4a973 --- a/resources/config/js/internal.js +++ b/resources/config/js/internal.js @@ -1,2 +1,2 @@ -cm.model.types = {"CM_Model_Language":5,"CM_Model_LanguageKey":36,"CM_Model_Location":6,"CM_Model_Splitfeature":7,"CM_Model_Splittest":8,"CM_Model_SplittestVariation":9,"CM_Model_User":10,"CM_Model_Location_City":27,"CM_Model_Location_Country":28,"CM_Model_Location_State":29,"CM_Model_Location_Zip":30,"CM_Model_Splittest_RequestClient":11,"CM_Model_Splittest_User":12,"CM_Model_Stream_Publish":13,"CM_Model_Stream_Subscribe":14,"CM_Model_StreamChannel_Message":15,"CM_Model_StreamChannel_Video":16,"CM_Model_StreamChannel_Message_User":17,"CM_Model_StreamChannelArchive_Video":18}; +cm.model.types = {"CM_Model_Language":5,"CM_Model_LanguageKey":36,"CM_Model_Location":6,"CM_Model_Splitfeature":7,"CM_Model_Splittest":8,"CM_Model_SplittestVariation":9,"CM_Model_User":10,"CM_Model_Location_City":27,"CM_Model_Location_Country":28,"CM_Model_Location_State":29,"CM_Model_Location_Zip":30,"CM_Model_Splittest_RequestClient":11,"CM_Model_Splittest_User":12,"CM_Model_Stream_Publish":13,"CM_Model_Stream_Subscribe":14,"CM_Model_StreamChannel_Message":15,"CM_Model_StreamChannel_Video":16,"CM_Model_StreamChannel_Message_User":17,"CM_Model_StreamChannelArchive_Video":18,"AP_Model_User":38}; cm.action.types = {"CM_Action_Email":3}; diff --git a/resources/config/local.dev.php b/resources/config/local.dev.php old mode 100644 new mode 100755 index 7660475..b72f6e5 --- a/resources/config/local.dev.php +++ b/resources/config/local.dev.php @@ -8,7 +8,7 @@ $config->CM_Mail->send = false; $config->CM_Redis_Client->server = array('host' => '127.0.0.1', 'port' => 6379); $config->CM_Stream_Adapter_Message_SocketRedis->servers = array( - array('httpHost' => 'localhost', 'httpPort' => 8085, 'sockjsUrls' => array('http://www.feed.dev:8090')), + array('httpHost' => 'localhost', 'httpPort' => 8085, 'sockjsUrls' => array('http://www.admin-panel.dev:8090')), ); $config->CM_Elasticsearch_Client->servers = array( array('host' => '127.0.0.1', 'port' => 9200), @@ -39,7 +39,7 @@ 'arguments' => array(array( 'default' => array( 'filesystem' => 'filesystem-usercontent', - 'url' => 'http://origin-www.feed.dev/userfiles', + 'url' => 'http://origin-www.admin-panel.dev/userfiles', ) ))); }; diff --git a/resources/db/setup.php b/resources/db/setup.php old mode 100644 new mode 100755 diff --git a/scripts/test.php b/scripts/test.php index d2a6a46..2858a8f 100755 --- a/scripts/test.php +++ b/scripts/test.php @@ -6,3 +6,7 @@ $bootloader->load(); echo "test\n"; + +AP_Model_User::_createStatic([ + +]); diff --git a/tests/bootstrap.php b/tests/bootstrap.php old mode 100644 new mode 100755 index 6750eaa..9a5f35b --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -6,4 +6,5 @@ $bootloader->load(); $suite = new CMTest_TestSuite(); +$suite->setDirTestData(__DIR__ . '/data/'); $suite->bootstrap(); diff --git a/tests/data/img/animated.gif b/tests/data/img/animated.gif new file mode 100755 index 0000000..6ae1e63 Binary files /dev/null and b/tests/data/img/animated.gif differ diff --git a/tests/data/img/corrupt-content.jpg b/tests/data/img/corrupt-content.jpg new file mode 100755 index 0000000..7fac2d0 Binary files /dev/null and b/tests/data/img/corrupt-content.jpg differ diff --git a/tests/data/img/corrupt-header.jpg b/tests/data/img/corrupt-header.jpg new file mode 100755 index 0000000..b0ec538 Binary files /dev/null and b/tests/data/img/corrupt-header.jpg differ diff --git a/tests/data/img/jpg-no-extension b/tests/data/img/jpg-no-extension new file mode 100755 index 0000000..074be5f Binary files /dev/null and b/tests/data/img/jpg-no-extension differ diff --git a/tests/data/img/square-image. b/tests/data/img/square-image. new file mode 100755 index 0000000..3d8c20a Binary files /dev/null and b/tests/data/img/square-image. differ diff --git a/tests/data/img/test.gif b/tests/data/img/test.gif new file mode 100755 index 0000000..81adf88 Binary files /dev/null and b/tests/data/img/test.gif differ diff --git a/tests/data/img/test.jpg b/tests/data/img/test.jpg new file mode 100755 index 0000000..d6850ce Binary files /dev/null and b/tests/data/img/test.jpg differ diff --git a/tests/data/test.jpg.zip b/tests/data/test.jpg.zip new file mode 100755 index 0000000..c09f68d Binary files /dev/null and b/tests/data/test.jpg.zip differ diff --git a/tests/helpers/APTest/TestCase.php b/tests/helpers/APTest/TestCase.php new file mode 100755 index 0000000..34f566f --- /dev/null +++ b/tests/helpers/APTest/TestCase.php @@ -0,0 +1,14 @@ +getMockSite('AP_Site_Abstract', null, array( + 'url' => 'http://www.default.dev', + 'urlCdn' => 'http://cdn.default.dev', + 'name' => 'Default', + )); + CM_Config::get()->CM_Site_Abstract->class = get_class($siteDefault); + parent::runBare(); + } +} diff --git a/tests/library/AP/Page/IndexTest.php b/tests/library/AP/Page/IndexTest.php new file mode 100755 index 0000000..c1b4966 --- /dev/null +++ b/tests/library/AP/Page/IndexTest.php @@ -0,0 +1,12 @@ +_createPage('AP_Page_Index'); + $html = $this->_renderPage($page); + + $this->assertTrue($html->has('.AP_Component_SignIn')); + $this->assertTrue($html->has('.AP_Component_SignUp')); + } +}