Closed shahidhk closed 10 years ago
Why do u want them in js files ? I current have some js variables set in base.html and use it everywhere Regarding the second point ... No, cant use variables in url. I had created a folder "fest-images" or something ... just put your files there ... It's not possible to fix this ... just make changes in yout branch
On Sun, May 4, 2014 at 1:35 AM, Shahidh K Muhammed <notifications@github.com
wrote:
Managing img and all in different branches is difficult. So, can we do this? Fest specific static files, lets put it in a folder having FEST_NAME. And while rendering, append the {{FEST_NAME}} to the static tag. But it accepts only string, right? Any thoughts?
Also FEST_NAME appearing in js files. Any idea?
Reply to this email directly or view it on GitHubhttps://github.com/The-WebOps-Club/fest-api/issues/67 .
Then we need to add it to gitignore, rebasing will create un-necessary pains else.
JS files, reference to fest name is there in drive.js and autocomplete.js. I will make appropriate changes
On Sun, May 4, 2014 at 1:40 AM, AbdealiJK notifications@github.com wrote:
Why do u want them in js files ? I current have some js variables set in base.html and use it everywhere Regarding the second point ... No, cant use variables in url. I had created a folder "fest-images" or something ... just put your files there ... It's not possible to fix this ... just make changes in yout branch
On Sun, May 4, 2014 at 1:35 AM, Shahidh K Muhammed < notifications@github.com
wrote:
Managing img and all in different branches is difficult. So, can we do this? Fest specific static files, lets put it in a folder having FEST_NAME. And while rendering, append the {{FEST_NAME}} to the static tag. But it accepts only string, right? Any thoughts?
Also FEST_NAME appearing in js files. Any idea?
Reply to this email directly or view it on GitHub< https://github.com/The-WebOps-Club/fest-api/issues/67> .
— Reply to this email directly or view it on GitHubhttps://github.com/The-WebOps-Club/fest-api/issues/67#issuecomment-42115137 .
Shahidh K Muhammed Undergraduate Student Department of Engineering Design Indian Institute of Technology Madras Chennai 600036 Mobile: (+91) 9496362472 http://shahidhkmuhammed.in
Oh, oops .. sorry :D And yeah, need to add in gitignore ...
On Sun, May 4, 2014 at 1:46 AM, Shahidh K Muhammed <notifications@github.com
wrote:
Then we need to add it to gitignore, rebasing will create un-necessary pains else.
JS files, reference to fest name is there in drive.js and autocomplete.js. I will make appropriate changes
On Sun, May 4, 2014 at 1:40 AM, AbdealiJK notifications@github.com wrote:
Why do u want them in js files ? I current have some js variables set in base.html and use it everywhere Regarding the second point ... No, cant use variables in url. I had created a folder "fest-images" or something ... just put your files there ... It's not possible to fix this ... just make changes in yout branch
On Sun, May 4, 2014 at 1:35 AM, Shahidh K Muhammed < notifications@github.com
wrote:
Managing img and all in different branches is difficult. So, can we do this? Fest specific static files, lets put it in a folder having FEST_NAME. And while rendering, append the {{FEST_NAME}} to the static tag. But it accepts only string, right? Any thoughts?
Also FEST_NAME appearing in js files. Any idea?
Reply to this email directly or view it on GitHub< https://github.com/The-WebOps-Club/fest-api/issues/67> .
Reply to this email directly or view it on GitHub< https://github.com/The-WebOps-Club/fest-api/issues/67#issuecomment-42115137>
.
Shahidh K Muhammed Undergraduate Student Department of Engineering Design Indian Institute of Technology Madras Chennai 600036 Mobile: (+91) 9496362472 http://shahidhkmuhammed.in
Reply to this email directly or view it on GitHubhttps://github.com/The-WebOps-Club/fest-api/issues/67#issuecomment-42115260 .
Also, we need to follow common file names then. Else the link in base.html and all will vary. Currently, favicon and login_page_logo are needed. Lets call them as it is. Im changing
I'll again repeat ... You can't have the same static files .. Just change the value in your branch On May 4, 2014 2:56 AM, "Shahidh K Muhammed" notifications@github.com wrote:
Also, we need to follow common file names then. Else the link in base.html and all will vary. Currently, favicon and login_page_logo are needed. Lets call them as it is. Im changing
Reply to this email directly or view it on GitHubhttps://github.com/The-WebOps-Club/fest-api/issues/67#issuecomment-42116871 .
Then problems will be there always while rebasing
Rebasing only changes modified lines and when we are making main site, this will be a big problem. On May 4, 2014 7:45 AM, "Shahidh K Muhammed" notifications@github.com wrote:
Then problems will be there always while rebasing
Reply to this email directly or view it on GitHubhttps://github.com/The-WebOps-Club/fest-api/issues/67#issuecomment-42121941 .
I think I havent got the rebase funda clearly. Let's say we have the meta.html file. I modified it in the saarang_production branch (Should I commit this or not?). And say i made some other changes in master. So, when i do a rebase master in saarang_production, the other changes wl be applied and this change i made remains there?
It will tell you you have a merge conflict between urs and the saarang_production version.
generally, what I do it git stash
and then rebase ... and then git stash add
to reapply my saarang changes. Now it will give merge conflicts and i apply whatever i wanna
BTW : I am doing this for now ... I have a shaastra_images folder which I am gonna use in shaastra. On my server, I'll just copy this as fest_images. This will make it easier for me ... cuz I don't wanna use scp and all later ...
I suggest you also create a saarang_images which will have the same.
If we do that, it will be peaceful
Im closing this ...
Managing img and all in different branches is difficult. So, can we do this? Fest specific static files, lets put it in a folder having FEST_NAME. And while rendering, append the {{FEST_NAME}} to the static tag. But it accepts only string, right? Any thoughts?
Also FEST_NAME appearing in js files. Any idea?