? Success
Referenced as Related to: # 5272

User tests: Successful: Unsuccessful:

avatar richard67
richard67
2 Dec 2014

See tracker issue #5272

avatar richard67 richard67 - open - 2 Dec 2014
avatar jissues-bot jissues-bot - change - 2 Dec 2014
Labels Added: ?
avatar richard67 richard67 - change - 2 Dec 2014
The description was changed
avatar smanzi
smanzi - comment - 2 Dec 2014

... if you want to spare 5 bytes you can do href="<?php echo $this->baseurl ?>/" ... :smile:

avatar richard67
richard67 - comment - 2 Dec 2014

@smanzi is not only 5 bytes but also 1 string concatenation operation for php ;-) I do this. But i could create only PR for 1 file, the error.php. how can i add the index.php to the same? I use the github website's ui for making the pr.

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.

avatar smanzi
smanzi - comment - 2 Dec 2014

I don't know... I've seen it: in error.php they use /index.php for home page... I guest it is not a big deal: it will work anyway, probably with just one more redirection, but I think it is OK to leave it as it is...

avatar smanzi
smanzi - comment - 2 Dec 2014

wrong title for this PR... error.php (protostar index.php)

avatar smanzi
smanzi - comment - 2 Dec 2014

I mean... Correct tracker issue #5272 (protostar index.php)

avatar richard67
richard67 - comment - 2 Dec 2014

no, title is correct, this pr did the error.php, next one does the index.php ... i have not found a way to do a pr for 2 files according to document "Using the Github UI to Make Pull Requests – Joomla! Documentation".

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.

avatar smanzi
smanzi - comment - 2 Dec 2014

what? two PR for 2 files same issue?? noooo... just one PR!!!

avatar richard67
richard67 - comment - 2 Dec 2014

sorry, too late ;-)

avatar dgt41
dgt41 - comment - 2 Dec 2014

@richard67 You have a PR. marge it and index.php will show up :tada:

avatar smanzi
smanzi - comment - 2 Dec 2014

let me check...

avatar brianteeman
brianteeman - comment - 2 Dec 2014

Using the github UI to make a PR for more than one file is easy
1. Make the first edit. This automatically creates a fork under your account
2. Go to your fork and make the second edit and you will get a message on
completion to update the PR
3. all done

On 2 December 2014 at 22:23, Richard Fath notifications@github.com wrote:

no, title is correct, this pr did the error.php, next one does the
index.php ... i have not found a way to do a pr for 2 files according to
document "Using the Github UI to Make Pull Requests – Joomla!
Documentation".

This comment was created with the J!Tracker Application
https://github.com/joomla/jissues at issues.joomla.org/joomla-cms/5291
http://issues.joomla.org/tracker/joomla-cms/5291.


Reply to this email directly or view it on GitHub
#5291 (comment).

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/

avatar smanzi
smanzi - comment - 2 Dec 2014

I'll kill #5292 and make changes in this one... is that possible @brianteeman using GitHub UI?

avatar richard67
richard67 - comment - 2 Dec 2014

Sorry, meanwhile we have 2 PRs and so 2 new tracker items ... those would have to be closed, too ... really sorry for that.

avatar smanzi
smanzi - comment - 2 Dec 2014

no problem Richard, you can close the PR yourself and then give it a second try....

avatar richard67
richard67 - comment - 2 Dec 2014

@smanzi am not sure what to do now

avatar smanzi
smanzi - comment - 2 Dec 2014

do you have skype and teamviewer?

avatar richard67
richard67 - comment - 2 Dec 2014

skype yes, but not started normally, and no teamviewer. i see that there are 2 branches on my repository: the one automatically created when i first edited error.php - this i renamed then to staging - and there i wanted to edit index.php, for which automatically another branch patch-3 was created. my first problem is to navigate to a certain branch in the github ui. and when you say i shall close the 2nd pr, shall i do this on github or in the tracker?

avatar smanzi
smanzi - comment - 2 Dec 2014

OK...

first of all, close the PR you wish here!

You said that you renamed one of the branch "staging"? BAD choice (and I don't even know how you could have done that...)! Forget that branch and close the PR associated to that branch here, in GitHub (you should see a close button or "comment and close")

Then go to the other branch: you chose branch by going to your main repo in GitHub and select correct branch from the drop down:
capture

then... whatever is the file you already edited in that branch... leave it alone. Modify the other file, save, it... done!

avatar richard67 richard67 - change - 2 Dec 2014
Title
Correct tracker issue #5272 with site title link
Correct tracker issue #5272
avatar smanzi
smanzi - comment - 2 Dec 2014

Perfect, now this is the good one...

avatar smanzi
smanzi - comment - 2 Dec 2014

You can close the other (if you don't have already done that)

avatar smanzi
smanzi - comment - 2 Dec 2014

you made it, OK! :+1:

avatar smanzi
smanzi - comment - 2 Dec 2014

oops... mad=made!!! sorry!!!

avatar richard67
richard67 - comment - 2 Dec 2014

hmm, no, not made all ... the branch of this good one is still the one called staging ... but everything else seems to be ok.

avatar smanzi
smanzi - comment - 2 Dec 2014

If Travis has nothing to complain about (I don't think so...) you're all set. Just remember of not closing/modifying the branch in your repo where you made this changes...

avatar smanzi
smanzi - comment - 2 Dec 2014

no problem... leave it alone: just don't make any further mods to YOUR 'staging' until this PR has been merged...

avatar richard67
richard67 - comment - 2 Dec 2014

ok ... long story small change ;-)

avatar smanzi
smanzi - comment - 2 Dec 2014

we all have to learn... it's OK!

avatar smanzi
smanzi - comment - 2 Dec 2014

but... my advice is to install GitHub in your PC and work there! Win or Mac?

avatar smanzi
smanzi - comment - 2 Dec 2014

(but don't do anything until this has been merged. soon we all hope...)

avatar richard67
richard67 - comment - 2 Dec 2014

Well, I'll do nothing on this branch and this repository until merged, and then I will clean it up. And as soon as I find a bit time I'll set up my windows 7 PC for a testing workstation. There is good documentation on this on the developers doc site.

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.

avatar smanzi
smanzi - comment - 2 Dec 2014

OK... Travis seems to be quite busy at this time, but don't worry...
Tomorrow or later tonight I'll test your PR... be confident!

avatar smanzi
smanzi - comment - 2 Dec 2014

AH, OK! Travis too is happy!!! :clap:

avatar richard67
richard67 - comment - 2 Dec 2014

just travis has finished - so welcome to testing

avatar smanzi
smanzi - comment - 2 Dec 2014

:stuck_out_tongue_winking_eye:

avatar smanzi
smanzi - comment - 2 Dec 2014

Sorry no time for testing right now... later!

avatar richard67
richard67 - comment - 2 Dec 2014

oh, i see it is late ... 00.28 CET ... have holiday here so did not keep an eye on it ... of course testing can wait until tomorrow ;-) good night

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.

avatar smanzi
smanzi - comment - 2 Dec 2014

holiday? where in the world?

avatar richard67
richard67 - comment - 2 Dec 2014

Germany, but not a public holiday ... only one of these 30 days annual leave we have, and I have to take all before year ends.

avatar smanzi
smanzi - comment - 2 Dec 2014

:+1: 'night!

avatar smanzi
smanzi - comment - 3 Dec 2014

@test success

URLs for site title in protostar (tested in article view) are:

Without this PR

    SEF: <a class="brand pull-left" href="/">
NON SEF: <a class="brand pull-left" href="">   <--- ERROR!

With this PR

    SEF: <a class="brand pull-left" href="/">
NON SEF: <a class="brand pull-left" href="/">   <--- OK!

congrats @richard67 :+1:

avatar smanzi smanzi - test_item - 3 Dec 2014 - Tested successfully
avatar smanzi
smanzi - comment - 3 Dec 2014

Tested with error page (404), same results: @test success confirmed

avatar dgt41
dgt41 - comment - 3 Dec 2014

@test OK

avatar brianteeman
brianteeman - comment - 3 Dec 2014

@test Issue confirmed and fix resolves it

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.

avatar brianteeman brianteeman - test_item - 3 Dec 2014 - Tested successfully
avatar brianteeman brianteeman - alter_testresult - 3 Dec 2014 - dgt41: Tested successfully
avatar brianteeman brianteeman - change - 3 Dec 2014
Status Pending Ready to Commit
avatar brianteeman
brianteeman - comment - 3 Dec 2014

Setting RTC

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5291.

avatar brianteeman brianteeman - change - 3 Dec 2014
Labels Added: ?
avatar infograf768 infograf768 - close - 5 Dec 2014
avatar zero-24 zero-24 - close - 5 Dec 2014
avatar infograf768 infograf768 - merge - 5 Dec 2014
avatar infograf768 infograf768 - close - 5 Dec 2014
avatar infograf768 infograf768 - change - 5 Dec 2014
Status Ready to Commit Closed
Closed_Date 0000-00-00 00:00:00 2014-12-05 09:01:42
avatar smanzi
smanzi - comment - 5 Dec 2014

@richard67 Congrats! You can now start tinkering with your forked repo and GitHub for Windows! ping me on skype (sergiomanzi) if you need help: I'm no expert, but I managed to have it do what is needed here...

avatar smanzi
smanzi - comment - 5 Dec 2014

@infograf768 and @richard67 I'm afraid there are big issues with this merged PR

The PR should have been a modification to index.php and error.php in Protostar template (and at a moment it was....)

Unhappily later-on (after testing!) @richard67 made what I think is a big mistake and merged the branch he was working on ('staging' in is forked repo) with upstream staging. The effect has been that the two modifications he originally made and were tested have been reverted.

Strange thing is that I see the mods here in the diff, but after having synced my forked repo with upstream I don't see them and I don't see them even in current codebase:

https://github.com/joomla/joomla-cms/blob/staging/templates/protostar/index.php
https://github.com/joomla/joomla-cms/blob/staging/templates/protostar/error.php

avatar smanzi
smanzi - comment - 5 Dec 2014

WARNING! In my forked repo I also see that several other unrelated files are affected... !!

avatar infograf768
infograf768 - comment - 5 Dec 2014

This PR has been deleted by @richard67 in his other PR as he used the same branch and updated it to staging by mistake.
Nothing broken. But this PR has to be recreated.

avatar smanzi
smanzi - comment - 5 Dec 2014

OK, I'm going to take care of that: will post new PR number here when ready...

avatar smanzi smanzi - reference | - 5 Dec 14
avatar smanzi
smanzi - comment - 5 Dec 2014

@infograf768 New PR is #5328, ready to merge if you want...

avatar richard67
richard67 - comment - 5 Dec 2014

@smanzi @infograf768 Thanks for realizing and fixing my mistake (blush). I thought I did synch with joomla:staging in the right way, but seems i didn't. But what was strange: The PR still looked ok, so I thought merging from upstream was the right way. How do you keep your personal repository fork up to date / in synch?

avatar infograf768 infograf768 - reference | - 6 Dec 14
avatar zero-24 zero-24 - change - 14 Oct 2015
Labels Removed: ?

Add a Comment

Login with GitHub to post a comment