[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ocs-webserver/dev] /: no message
From: david nelband <null () kde ! org>
Date: 2018-09-20 12:19:29
Message-ID: E1g2xvd-0000ym-DM () code ! kde ! org
[Download RAW message or body]
Git commit 00eaad12e795a0664c4617dd229790dcb85bbc14 by david nelband.
Committed on 20/09/2018 at 12:19.
Pushed by dnelband into branch 'dev'.
no message
M +7 -7 application/modules/default/views/scripts/product/index.phtml
M +13 -8 httpdocs/theme/react/app-getit/app.js
A +1 -0 httpdocs/theme/react/assets/css/get-it.css
A +1 -0 httpdocs/theme/react/assets/css/get-it.css.map
A +10 -0 httpdocs/theme/react/assets/less/get-it.less
M +16 -11 httpdocs/theme/react/getit.js
https://commits.kde.org/ocs-webserver/00eaad12e795a0664c4617dd229790dcb85bbc14
diff --git a/application/modules/default/views/scripts/product/index.phtml \
b/application/modules/default/views/scripts/product/index.phtml index \
0d695762..6a75ac0d 100644
--- a/application/modules/default/views/scripts/product/index.phtml
+++ b/application/modules/default/views/scripts/product/index.phtml
@@ -96,6 +96,10 @@ $userRoleName = $helperUserRole->userRole();
$filesJson = $this->filesJson;
?>
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" \
rel="stylesheet"> + <link href="/theme/react/lib/mdl/material.min.css" \
type="text/css" rel="stylesheet"/> + <link \
href="/theme/react/assets/css/get-it.css" type="text/css" rel="stylesheet"/> +
<!-- facebook -->
<div id="fb-root"></div>
<?php if (Zend_Auth::getInstance()->hasIdentity()) {
@@ -906,10 +910,6 @@ $userRoleName = $helperUserRole->userRole();
</span>
</div>
</main>
- <script>
- var filesJson = <?php echo $this->filesJson ?>; // Tab files
- </script>
- <script type="text/javascript" src="/theme/react/getit.js"></script>
<script>(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
@@ -962,10 +962,10 @@ $userRoleName = $helperUserRole->userRole();
<script type="text/javascript">
-var product = <?php echo $productJson ?>;
-var filesJson = <?php echo $filesJson ?>;
+ var product = <?php echo $productJson ?>;
+ var filesJson = <?php echo $filesJson ?>;
</script>
-
+<script type="text/javascript" src="/theme/react/getit.js"></script>
<?php $this->inlineScript()->appendScript(
' $(document).ready(function(){
diff --git a/httpdocs/theme/react/app-getit/app.js \
b/httpdocs/theme/react/app-getit/app.js index 42fcb8d7..f06b28a8 100644
--- a/httpdocs/theme/react/app-getit/app.js
+++ b/httpdocs/theme/react/app-getit/app.js
@@ -2,7 +2,9 @@ class GetIt extends React.Component {
constructor(props){
super(props);
this.state = {
- files:window.filesJson
+ product:window.product,
+ files:window.filesJson,
+ env:'test'
};
}
@@ -18,9 +20,11 @@ class GetIt extends React.Component {
Get it
</button>
<div className="modal fade" id="myModal" tabIndex="-1" role="dialog" \
aria-labelledby="myModalLabel">
- <div className="modal-dialog" role="document">
+ <div id="get-it-modal" className="modal-dialog" role="document">
<GetItFilesList
files={this.state.files}
+ product={this.state.product}
+ env={this.state.env}
/>
</div>
</div>
@@ -35,6 +39,7 @@ class GetItFilesList extends React.Component {
const files = this.props.files.map((f,index) => (
<GetItFilesListItem
product={this.props.product}
+ env={this.props.env}
key={index}
file={f}
/>
@@ -89,17 +94,17 @@ class GetItFilesListItem extends React.Component {
componentDidMount() {
let baseUrl, downloadLinkUrlAttr;
- // if (store.getState().env === 'live') {
+ if (this.props.env === 'live') {
baseUrl = 'opendesktop.org';
downloadLinkUrlAttr = "https%3A%2F%dl.opendesktop.org%2Fapi%2F";
- // } else {
- // baseUrl = 'pling.cc';
- // downloadLinkUrlAttr = "https%3A%2F%2Fcc.ppload.com%2Fapi%2F";
- // }
+ } else {
+ baseUrl = 'pling.cc';
+ downloadLinkUrlAttr = "https%3A%2F%2Fcc.ppload.com%2Fapi%2F";
+ }
const f = this.props.file;
const timestamp = Math.floor((new Date().getTime() / 1000)+3600)
- const fileDownloadHash = \
appHelpers.generateFileDownloadHash(f,store.getState().env); + const \
fileDownloadHash = appHelpers.generateFileDownloadHash(f,this.props.env); let \
downloadLink = "https://"+baseUrl+ "/p/"+this.props.product.project_id+
"/startdownload?file_id="+f.id+
diff --git a/httpdocs/theme/react/assets/css/get-it.css \
b/httpdocs/theme/react/assets/css/get-it.css new file mode 100644
index 00000000..db256ec4
--- /dev/null
+++ b/httpdocs/theme/react/assets/css/get-it.css
@@ -0,0 +1 @@
+#get-it-modal{width:90%}#get-it-modal .mdl-data-table{width:100%}
\ No newline at end of file
diff --git a/httpdocs/theme/react/assets/css/get-it.css.map \
b/httpdocs/theme/react/assets/css/get-it.css.map new file mode 100644
index 00000000..d285ca76
--- /dev/null
+++ b/httpdocs/theme/react/assets/css/get-it.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["get-it.less"],"names":[],"mappings":"AAGA,cACE,UADF,aAEE,iBACE"}
\ No newline at end of file
diff --git a/httpdocs/theme/react/assets/less/get-it.less \
b/httpdocs/theme/react/assets/less/get-it.less new file mode 100644
index 00000000..edefd12e
--- /dev/null
+++ b/httpdocs/theme/react/assets/less/get-it.less
@@ -0,0 +1,10 @@
+out: ../css/get-it.css, sourcemap: true, compress: true
+
+@import "elements.less";
+
+#get-it-modal {
+ width: 90%;
+ .mdl-data-table {
+ width: 100%;
+ }
+}
diff --git a/httpdocs/theme/react/getit.js b/httpdocs/theme/react/getit.js
index 4422c8e5..79fc214d 100644
--- a/httpdocs/theme/react/getit.js
+++ b/httpdocs/theme/react/getit.js
@@ -262,7 +262,9 @@ class GetIt extends React.Component {
constructor(props) {
super(props);
this.state = {
- files: window.filesJson
+ product: window.product,
+ files: window.filesJson,
+ env: 'test'
};
}
@@ -285,9 +287,11 @@ class GetIt extends React.Component {
{ className: "modal fade", id: "myModal", tabIndex: "-1", role: "dialog", \
"aria-labelledby": "myModalLabel" }, React.createElement(
"div",
- { className: "modal-dialog", role: "document" },
+ { id: "get-it-modal", className: "modal-dialog", role: "document" },
React.createElement(GetItFilesList, {
- files: this.state.files
+ files: this.state.files,
+ product: this.state.product,
+ env: this.state.env
})
)
)
@@ -300,6 +304,7 @@ class GetItFilesList extends React.Component {
let filesDisplay;
const files = this.props.files.map((f, index) => \
React.createElement(GetItFilesListItem, { product: this.props.product,
+ env: this.props.env,
key: index,
file: f
}));
@@ -414,17 +419,17 @@ class GetItFilesListItem extends React.Component {
componentDidMount() {
let baseUrl, downloadLinkUrlAttr;
- // if (store.getState().env === 'live') {
- baseUrl = 'opendesktop.org';
- downloadLinkUrlAttr = "https%3A%2F%dl.opendesktop.org%2Fapi%2F";
- // } else {
- // baseUrl = 'pling.cc';
- // downloadLinkUrlAttr = "https%3A%2F%2Fcc.ppload.com%2Fapi%2F";
- // }
+ if (this.props.env === 'live') {
+ baseUrl = 'opendesktop.org';
+ downloadLinkUrlAttr = "https%3A%2F%dl.opendesktop.org%2Fapi%2F";
+ } else {
+ baseUrl = 'pling.cc';
+ downloadLinkUrlAttr = "https%3A%2F%2Fcc.ppload.com%2Fapi%2F";
+ }
const f = this.props.file;
const timestamp = Math.floor(new Date().getTime() / 1000 + 3600);
- const fileDownloadHash = appHelpers.generateFileDownloadHash(f, \
store.getState().env); + const fileDownloadHash = \
appHelpers.generateFileDownloadHash(f, this.props.env); let downloadLink = \
"https://" + baseUrl + "/p/" + this.props.product.project_id + \
"/startdownload?file_id=" + f.id + "&file_name=" + f.title + "&file_type=" + f.type + \
"&file_size=" + f.size + "&url=" + downloadLinkUrlAttr + \
"files%2Fdownloadfile%2Fid%2F" + f.id + "%2Fs%2F" + fileDownloadHash + "%2Ft%2F" + \
timestamp + "%2Fu%2F" + this.props.product.member_id + "%2F" + f.title; \
this.setState({ downloadLink: downloadLink }); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic